aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Spear.lkshw4
-rw-r--r--Spear/Collision.hs2
-rw-r--r--Spear/Render/AnimatedModel.hs4
-rw-r--r--Spear/Render/StaticModel.hs2
4 files changed, 6 insertions, 6 deletions
diff --git a/Spear.lkshw b/Spear.lkshw
index ba05db3..07f4337 100644
--- a/Spear.lkshw
+++ b/Spear.lkshw
@@ -1,10 +1,10 @@
1Version of workspace file format: 1Version of workspace file format:
2 1 2 1
3Time of storage: 3Time of storage:
4 "Mon Sep 3 18:57:03 CEST 2012" 4 "Mon Sep 3 19:04:32 CEST 2012"
5Name of the workspace: 5Name of the workspace:
6 "Spear" 6 "Spear"
7File paths of contained packages: 7File paths of contained packages:
8 ["demos/simple-scene/simple-scene.cabal","Spear.cabal"] 8 ["demos/simple-scene/simple-scene.cabal","Spear.cabal"]
9Maybe file path of an active package: 9Maybe file path of an active package:
10 Just "demos/simple-scene/simple-scene.cabal" \ No newline at end of file 10 Just "Spear.cabal" \ No newline at end of file
diff --git a/Spear/Collision.hs b/Spear/Collision.hs
index f0f5814..8c334c1 100644
--- a/Spear/Collision.hs
+++ b/Spear/Collision.hs
@@ -168,7 +168,7 @@ generatePoints = foldr generate []
168 p4 = c - unity * (vec2 r r) 168 p4 = c - unity * (vec2 r r)
169 169
170 170
171-- | Compute collisioners in view space from the given 3D AABB. 171-- | Compute AABB collisioners in view space from the given 3D AABB.
172mkCols :: M4.Matrix4 -- ^ Modelview matrix 172mkCols :: M4.Matrix4 -- ^ Modelview matrix
173 -> Box 173 -> Box
174 -> [Collisioner] 174 -> [Collisioner]
diff --git a/Spear/Render/AnimatedModel.hs b/Spear/Render/AnimatedModel.hs
index ae86cfe..20ec4d1 100644
--- a/Spear/Render/AnimatedModel.hs
+++ b/Spear/Render/AnimatedModel.hs
@@ -23,7 +23,7 @@ module Spear.Render.AnimatedModel
23 -- * Rendering 23 -- * Rendering
24, bind 24, bind
25, render 25, render
26 -- * Collisions 26 -- * Collision
27, mkColsFromAnimated 27, mkColsFromAnimated
28) 28)
29where 29where
@@ -237,7 +237,7 @@ render uniforms (AnimatedModelRenderer model _ _ _ curFrame fp _) =
237 drawArrays gl_TRIANGLES (n*curFrame) n 237 drawArrays gl_TRIANGLES (n*curFrame) n
238 238
239 239
240-- | Compute collisioners in 2d virtual space. 240-- | Compute AABB collisioners in view space from the given model.
241mkColsFromAnimated 241mkColsFromAnimated
242 :: Int -- ^ Source frame 242 :: Int -- ^ Source frame
243 -> Int -- ^ Dest frame 243 -> Int -- ^ Dest frame
diff --git a/Spear/Render/StaticModel.hs b/Spear/Render/StaticModel.hs
index b4ad20e..cdd5c31 100644
--- a/Spear/Render/StaticModel.hs
+++ b/Spear/Render/StaticModel.hs
@@ -148,7 +148,7 @@ render uniforms (StaticModelRenderer model) =
148 drawArrays gl_TRIANGLES 0 $ nVertices model 148 drawArrays gl_TRIANGLES 0 $ nVertices model
149 149
150 150
151-- | Compute collisioners in 2d virtual space. 151-- | Compute AABB collisioners in view space from the given model.
152mkColsFromStatic 152mkColsFromStatic
153 :: Matrix4 -- ^ Modelview matrix 153 :: Matrix4 -- ^ Modelview matrix
154 -> StaticModelResource 154 -> StaticModelResource