summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCsabaHruska <>2011-10-29 11:59:35 (GMT)
committerhdiff <hdiff@luite.com>2011-10-29 11:59:35 (GMT)
commitcbd3588412fce89bdcf31c44a21ed175f9fde425 (patch)
tree5dec889cd5d28a7d986c47933c6c9c0050442156
parentf362db25ca1687a8be6f910288defd12b37b6ebf (diff)
version 0.2.2HEAD0.2.2master
-rw-r--r--lambdacube-examples.cabal3
-rw-r--r--media/ogrehead.vmeshbin0 -> 285493 bytes
-rw-r--r--src/lambdacube-basic.hs2
-rw-r--r--src/lambdacube-cameratrack.hs2
4 files changed, 4 insertions, 3 deletions
diff --git a/lambdacube-examples.cabal b/lambdacube-examples.cabal
index 02719b2..35e20d3 100644
--- a/lambdacube-examples.cabal
+++ b/lambdacube-examples.cabal
@@ -1,5 +1,5 @@
Name: lambdacube-examples
-Version: 0.2.1
+Version: 0.2.2
Cabal-Version: >= 1.2
Synopsis: Examples for LambdaCube
Category: Graphics
@@ -38,6 +38,7 @@ Data-Files:
media/Ground.mesh.xml
media/knot.mesh.xml
media/ogrehead.mesh.xml
+ media/ogrehead.vmesh
media/Ogre.material
media/r2skin.jpg
media/Robot.material
diff --git a/media/ogrehead.vmesh b/media/ogrehead.vmesh
new file mode 100644
index 0000000..384a478
--- /dev/null
+++ b/media/ogrehead.vmesh
Binary files differ
diff --git a/src/lambdacube-basic.hs b/src/lambdacube-basic.hs
index 1a2002c..5b6fb93 100644
--- a/src/lambdacube-basic.hs
+++ b/src/lambdacube-basic.hs
@@ -37,7 +37,7 @@ main = do
mat i = materials !! (i `mod` materialLen)
addScene $
[ node "Root" "Robot" idmtx [m "robot.mesh.xml"]
- , node "Root" "OgreHead" (scalingUniformProj4 0.05) [m "ogrehead.mesh.xml",m "Quad.mesh.xml"]
+ , node "Root" "OgreHead" (scalingUniformProj4 0.05) [m "ogrehead.vmesh",m "Quad.mesh.xml"]
, node "Root" "Light1" (translation (Vec3 5 5 10)) [defaultLight,m "ogrehead.mesh.xml"]
, node "Root" "CameraNode1" (translation (Vec3 0 0 10)) [simpleCamera "Camera1"]
, node "Root" "CameraEye" idmtx [mesh (Just RQP_EarlySky) Nothing "Box.mesh.xml" ]
diff --git a/src/lambdacube-cameratrack.hs b/src/lambdacube-cameratrack.hs
index d35b7bb..667dd89 100644
--- a/src/lambdacube-cameratrack.hs
+++ b/src/lambdacube-cameratrack.hs
@@ -38,7 +38,7 @@ main = do
let mrq = mesh defaultRQP
m = mrq Nothing
addScene $
- [ node "Root" "OgreHead" idmtx [m "ogrehead.mesh.xml"]
+ [ node "Root" "OgreHead" idmtx [m "ogrehead.vmesh"]
, node "Root" "Light1" idmtx [light simpleLight { lgDiffuse = (1,0,0,1) }]
, node "Root" "Light2" idmtx [defaultLight]
, node "Root" "Light3" idmtx [light simpleLight { lgDiffuse = (0,0,1,1) }]