From e51486ea0ae18bd7291eb7bda8d7f0c6f0caddf1 Mon Sep 17 00:00:00 2001 From: Marc Sunet Date: Mon, 3 Sep 2012 19:06:44 +0200 Subject: docs --- Spear.lkshw | 4 ++-- Spear/Collision.hs | 2 +- Spear/Render/AnimatedModel.hs | 4 ++-- 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 @@ Version of workspace file format: 1 Time of storage: - "Mon Sep 3 18:57:03 CEST 2012" + "Mon Sep 3 19:04:32 CEST 2012" Name of the workspace: "Spear" File paths of contained packages: ["demos/simple-scene/simple-scene.cabal","Spear.cabal"] Maybe file path of an active package: - Just "demos/simple-scene/simple-scene.cabal" \ No newline at end of file + 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 [] p4 = c - unity * (vec2 r r) --- | Compute collisioners in view space from the given 3D AABB. +-- | Compute AABB collisioners in view space from the given 3D AABB. mkCols :: M4.Matrix4 -- ^ Modelview matrix -> Box -> [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 -- * Rendering , bind , render - -- * Collisions + -- * Collision , mkColsFromAnimated ) where @@ -237,7 +237,7 @@ render uniforms (AnimatedModelRenderer model _ _ _ curFrame fp _) = drawArrays gl_TRIANGLES (n*curFrame) n --- | Compute collisioners in 2d virtual space. +-- | Compute AABB collisioners in view space from the given model. mkColsFromAnimated :: Int -- ^ Source frame -> 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) = drawArrays gl_TRIANGLES 0 $ nVertices model --- | Compute collisioners in 2d virtual space. +-- | Compute AABB collisioners in view space from the given model. mkColsFromStatic :: Matrix4 -- ^ Modelview matrix -> StaticModelResource -- cgit v1.2.3