diff options
author | Marc Sunet <jeannekamikaze@gmail.com> | 2012-09-03 19:06:44 +0200 |
---|---|---|
committer | Marc Sunet <jeannekamikaze@gmail.com> | 2012-09-03 19:06:44 +0200 |
commit | e51486ea0ae18bd7291eb7bda8d7f0c6f0caddf1 (patch) | |
tree | 633ea88d100cec013894af12a6556551a6463b1c | |
parent | 7f691d48a462364c76edd302f797482cdc42820f (diff) |
docs
-rw-r--r-- | Spear.lkshw | 4 | ||||
-rw-r--r-- | Spear/Collision.hs | 2 | ||||
-rw-r--r-- | Spear/Render/AnimatedModel.hs | 4 | ||||
-rw-r--r-- | Spear/Render/StaticModel.hs | 2 |
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 @@ | |||
1 | Version of workspace file format: | 1 | Version of workspace file format: |
2 | 1 | 2 | 1 |
3 | Time of storage: | 3 | Time of storage: |
4 | "Mon Sep 3 18:57:03 CEST 2012" | 4 | "Mon Sep 3 19:04:32 CEST 2012" |
5 | Name of the workspace: | 5 | Name of the workspace: |
6 | "Spear" | 6 | "Spear" |
7 | File paths of contained packages: | 7 | File paths of contained packages: |
8 | ["demos/simple-scene/simple-scene.cabal","Spear.cabal"] | 8 | ["demos/simple-scene/simple-scene.cabal","Spear.cabal"] |
9 | Maybe file path of an active package: | 9 | Maybe 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. |
172 | mkCols :: M4.Matrix4 -- ^ Modelview matrix | 172 | mkCols :: 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 | ) |
29 | where | 29 | where |
@@ -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. |
241 | mkColsFromAnimated | 241 | mkColsFromAnimated |
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. |
152 | mkColsFromStatic | 152 | mkColsFromStatic |
153 | :: Matrix4 -- ^ Modelview matrix | 153 | :: Matrix4 -- ^ Modelview matrix |
154 | -> StaticModelResource | 154 | -> StaticModelResource |