A scalar integral function for Fractional instances.
> integral v0 s = transfer v0 (\dt v v0 → v0+v*realToFrac dt) s
An integral function for two-dimensional vectors defined in the Vector module.
> integralVec v0 s = transfer v0 (\dt v v0 → v0^+^(v^*.realToFrac dt)) s -
This module contains a class for two-dimensional vectors, a strict datatype to instantiate it, and another instance for signals of the same type. We use CFloat as the coordinate type, because GLfloat is its synonym.
> {-# LANGUAGE MultiParamTypeClasses, FunctionalDependencies, FlexibleInstances #-} +
This module contains a class for two-dimensional vectors, a strict datatype to instantiate it, and another instance for signals of the same type.
> {-# LANGUAGE MultiParamTypeClasses, FunctionalDependencies, FlexibleInstances, TypeSynonymInstances #-} > > module Common.Vector where > > import Control.Applicative > import FRP.Elerea -> import Foreign.C.Types +> import Graphics.Rendering.OpenGL > -> data Vec = V { getX :: !CFloat, getY :: !CFloat } +> data Vec = V { getX :: !GLfloat, getY :: !GLfloat } > > infixl 7 ^*. > infixl 7 .*^ @@ -213,7 +213,7 @@ > dot :: v → v → c > cross :: v → v → c > -> instance Vector2D Vec CFloat where +> instance Vector2D Vec GLfloat where > V x1 y1 ^+^ V x2 y2 = V (x1+x2) (y1+y2) > V x1 y1 ^-^ V x2 y2 = V (x1-x2) (y1-y2) > V x y ^*. t = V (x*t) (y*t) @@ -222,7 +222,7 @@ > V x1 y1 `dot` V x2 y2 = x1*y1+x2*y2 > V x1 y1 `cross` V x2 y2 = x1*y2-x2*y1 > -> instance Vector2D (Signal Vec) (Signal CFloat) where +> instance Vector2D (Signal Vec) (Signal GLfloat) where > (^+^) = liftA2 (^+^) > (^-^) = liftA2 (^-^) > (^*.) = liftA2 (^*.) diff --git a/doc/Chase.html b/doc/Chase.html --- a/doc/Chase.html +++ b/doc/Chase.html @@ -98,15 +98,15 @@ > Nothing → return ()
A scalar integral function for Fractional instances.
> integral v0 s = transfer v0 (\dt v v0 → v0+v*realToFrac dt) s
An integral function for two-dimensional vectors defined in the Vector module.
> integralVec v0 s = transfer v0 (\dt v v0 → v0^+^(v^*.realToFrac dt)) s -
This module contains a class for two-dimensional vectors, a strict datatype to instantiate it, and another instance for signals of the same type. We use CFloat as the coordinate type, because GLfloat is its synonym.
> {-# LANGUAGE MultiParamTypeClasses, FunctionalDependencies, FlexibleInstances #-} +
This module contains a class for two-dimensional vectors, a strict datatype to instantiate it, and another instance for signals of the same type.
> {-# LANGUAGE MultiParamTypeClasses, FunctionalDependencies, FlexibleInstances, TypeSynonymInstances #-} > > module Common.Vector where > > import Control.Applicative > import FRP.Elerea -> import Foreign.C.Types +> import Graphics.Rendering.OpenGL > -> data Vec = V { getX :: !CFloat, getY :: !CFloat } +> data Vec = V { getX :: !GLfloat, getY :: !GLfloat } > > infixl 7 ^*. > infixl 7 .*^ @@ -124,7 +124,7 @@ > dot :: v → v → c > cross :: v → v → c > -> instance Vector2D Vec CFloat where +> instance Vector2D Vec GLfloat where > V x1 y1 ^+^ V x2 y2 = V (x1+x2) (y1+y2) > V x1 y1 ^-^ V x2 y2 = V (x1-x2) (y1-y2) > V x y ^*. t = V (x*t) (y*t) @@ -133,7 +133,7 @@ > V x1 y1 `dot` V x2 y2 = x1*y1+x2*y2 > V x1 y1 `cross` V x2 y2 = x1*y2-x2*y1 > -> instance Vector2D (Signal Vec) (Signal CFloat) where +> instance Vector2D (Signal Vec) (Signal GLfloat) where > (^+^) = liftA2 (^+^) > (^-^) = liftA2 (^-^) > (^*.) = liftA2 (^*.) diff --git a/elerea-examples.cabal b/elerea-examples.cabal --- a/elerea-examples.cabal +++ b/elerea-examples.cabal @@ -1,5 +1,5 @@ Name: elerea-examples -Version: 1.0.1 +Version: 1.0.2 Cabal-Version: >= 1.2 Synopsis: Example applications for Elerea Category: reactivity, FRP @@ -41,12 +41,12 @@ Executable: elerea-breakout HS-Source-Dirs: src Main-IS: Breakout.lhs - Build-Depends: base >= 3 && < 5, elerea >= 1.0, OpenGL, GLFW + Build-Depends: base >= 3 && < 5, elerea >= 1.0, OpenGL, GLFW >= 0.4 GHC-Options: -O2 Executable elerea-chase Executable: elerea-chase HS-Source-Dirs: src Main-IS: Chase.lhs - Build-Depends: base >= 3 && < 5, elerea >= 1.0, OpenGL, GLFW + Build-Depends: base >= 3 && < 5, elerea >= 1.0, OpenGL, GLFW >= 0.4 GHC-Options: -O2 diff --git a/src/Common/Vector.lhs b/src/Common/Vector.lhs --- a/src/Common/Vector.lhs +++ b/src/Common/Vector.lhs @@ -3,18 +3,17 @@ This module contains a class for two-dimensional vectors, a strict datatype to instantiate it, and another instance for signals of the -same type. We use CFloat as the coordinate type, because GLfloat is -its synonym. +same type. -> {-# LANGUAGE MultiParamTypeClasses, FunctionalDependencies, FlexibleInstances #-} +> {-# LANGUAGE MultiParamTypeClasses, FunctionalDependencies, FlexibleInstances, TypeSynonymInstances #-} > > module Common.Vector where > > import Control.Applicative > import FRP.Elerea -> import Foreign.C.Types +> import Graphics.Rendering.OpenGL > -> data Vec = V { getX :: !CFloat, getY :: !CFloat } +> data Vec = V { getX :: !GLfloat, getY :: !GLfloat } > > infixl 7 ^*. > infixl 7 .*^ @@ -32,7 +31,7 @@ > dot :: v -> v -> c > cross :: v -> v -> c > -> instance Vector2D Vec CFloat where +> instance Vector2D Vec GLfloat where > V x1 y1 ^+^ V x2 y2 = V (x1+x2) (y1+y2) > V x1 y1 ^-^ V x2 y2 = V (x1-x2) (y1-y2) > V x y ^*. t = V (x*t) (y*t) @@ -41,7 +40,7 @@ > V x1 y1 `dot` V x2 y2 = x1*y1+x2*y2 > V x1 y1 `cross` V x2 y2 = x1*y2-x2*y1 > -> instance Vector2D (Signal Vec) (Signal CFloat) where +> instance Vector2D (Signal Vec) (Signal GLfloat) where > (^+^) = liftA2 (^+^) > (^-^) = liftA2 (^-^) > (^*.) = liftA2 (^*.)