FieldTrip 0.2.2 → 0.2.4

raw patch · 7 files changed

+17/−20 lines, 7 filesdep ~vector-spacePVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependency ranges changed: vector-space

API changes (from Hackage documentation)

Files

• FieldTrip.cabal +2/−5
• src/Graphics/FieldTrip/ParamSurf.hs +1/−1
• src/Graphics/FieldTrip/Point2.hs +1/−1
• src/Graphics/FieldTrip/Point3.hs +1/−1
• src/Graphics/FieldTrip/Vector2.hs +1/−1
• src/Graphics/FieldTrip/Vector3.hs +4/−4
• wikipage.tw +7/−7

@@ -1,5 +1,5 @@ Name:                FieldTrip-Version:             0.2.2+Version:             0.2.4 Synopsis: 	     Functional 3D Category:            graphics Description:@@ -7,9 +7,6 @@   .   Please see the project wiki page: <http://haskell.org/haskellwiki/FieldTrip>   .-  The module documentation pages have links to colorized source code and-  to wiki pages where you can read and contribute user comments.  Enjoy!-  .   &#169; 2008 by Andy Gill and Conal Elliott; BSD3 license. Author:              Conal Elliott and Andy Gill Maintainer:          conal@conal.net, andygill@ku.edu@@ -21,7 +18,7 @@ build-type:	     Simple Hs-Source-Dirs:      src Extensions:          -Build-Depends:       base, old-time, OpenGL, GLUT, TypeCompose, MemoTrie, vector-space >= 0.5, graphicsFormats+Build-Depends:       base, old-time, OpenGL, GLUT, TypeCompose, MemoTrie, vector-space >= 0.5.7, graphicsFormats Exposed-Modules:      		     Graphics.FieldTrip 		     Graphics.FieldTrip.Misc

@@ -62,7 +62,7 @@ -- | Torus, given radius of sweep circle and cross section torus :: (Floating s, VectorSpace s, Scalar s ~ s) => s -> s -> Surf s -- torus sr cr = revolve (\ s -> (sr,0) ^+^ cr *^ circle s)-torus sr cr = revolve (const (sr,0) ^+^ cr *^ circle)+torus sr cr = revolve (const (sr,0) ^+^ const cr *^ circle)  -- Surface of revolution, formed by rotation around Z axis.  The curve is -- parameterized by u, and the rotation by v.  In this generalized

@@ -43,7 +43,7 @@ -- UndecidableInstances because "the Coverage Condition fails" below  instance VectorSpace u => AffineSpace (Vertex2 u) where-  type AVector (Vertex2 u) = Vector2 u+  type Diff (Vertex2 u) = Vector2 u   Vertex2 u v .-. Vertex2 u' v' = Vector2 (u ^-^ u') (v ^-^ v')   Vertex2 u v .+^ Vector2 dx dy = Vertex2 (u ^+^ dx) (v ^+^ dy) 

@@ -43,7 +43,7 @@ -- UndecidableInstances because "the Coverage Condition fails" below  instance VectorSpace u => AffineSpace (Vertex3 u) where-  type AVector (Vertex3 u) = Vector3 u+  type Diff (Vertex3 u) = Vector3 u   Vertex3 u v w .-. Vertex3 u' v' w' = Vector3 (u ^-^ u') (v ^-^ v') (w ^-^ w')   Vertex3 u v w .+^ Vector3 dx dv dw = Vertex3 (u ^+^ dx) (v ^+^ dv) (w ^+^ dw) 

@@ -110,7 +110,7 @@ --   normalVec v = cross2 (derivativeAt v 1)  instance HasNormal (Float :> Vector2 Float) where-  normalVec v = cross2 (derivative v `untrie` ())+  normalVec v = cross2 (v `derivAtBasis` ())  -- instance HasNormal (One Double :> Two Double) where --   normalVec v = cross2 (derivative v `untrie` ())

@@ -16,7 +16,7 @@ -- efficiency. ---------------------------------------------------------------------- -module Graphics.FieldTrip.Vector3 +module Graphics.FieldTrip.Vector3   (    Vector3(..), vector3   , xVector3, yVector3, zVector3@@ -125,7 +125,7 @@          => HasNormal (Vector2 s :> Vector3 s) where   normalVec v = d (Left ()) `cross3` d (Right ())    where-     d = untrie (derivative v)+     d = derivAtBasis v  -- Above doesn't seem to work in ghc 6.8.  So use explicit instances for -- 'Float' & 'Double'.  Revisit.@@ -178,10 +178,10 @@ instance HasNormal (Three (Vector2 Double :> Double)) where   normalVec = unvector3D . normalVec . vector3D -vector3D :: (VectorSpace s, HasTrie (Basis a)) =>+vector3D :: (VectorSpace s, HasBasis a, HasTrie (Basis a)) =>             Three (a :> s) -> a :> (Vector3 s) vector3D (u,v,w) = liftD3 Vector3 u v w -unvector3D :: (VectorSpace s, HasTrie (Basis a)) =>+unvector3D :: (VectorSpace s, HasBasis a, HasTrie (Basis a)) =>               a :> (Vector3 s) -> Three (a :> s) unvector3D d = (vector3x <$>> d, vector3y <$>> d, vector3z <$>> d)

@@ -10,16 +10,16 @@ Since FieldTrip is functional, it is about ''being'' rather than ''doing''. One describes what models are, not how to render them. -FieldTrip is just a toy / early release at this point, to show what's going on and see who's interested in collaborating on developing it further.+FieldTrip is work-in-progress.+It's being released to show what's going on and see who's interested in collaborating on developing it further.  Besides this wiki page, here are more ways to find out about and get involved with FieldTrip: * Join the [http://www.haskell.org/mailman/listinfo/FieldTrip FieldTrip mailing list].-* Peruse [http://code.haskell.org/FieldTrip/doc/html/ the library documentation].-* Install [http://hackage.haskell.org/cgi-bin/hackage-scripts/package/FieldTrip from Hackage].-* Download the code repository: '''<tt>darcs get http://code.haskell.org/FieldTrip</tt>'''.  Patches welcome.-* Report bugs and request features on [http://trac.haskell.org/fieldtrip/ the tracker].-* Examine the [[FieldTrip/Versions| version history]].-+* Visit the [http://hackage.haskell.org/cgi-bin/hackage-scripts/package/FieldTrip Hackage page] for library documentation and to download & install.+* Or install with <tt>cabal install FieldTrip</tt>.+* Get the code repository: <tt>darcs get http://code.haskell.org/FieldTrip</tt>.+<!-- * See the [[FieldTrip/Versions| version history]]. -->+* Report bugs and request features on [http://trac.haskell.org/FieldTrip/ the tracker].  == Basic types ==