1 files changed, 82 insertions, 77 deletions
diff --git a/Spear.cabal b/Spear.cabal
index 7025fcd..448f7f4 100644
--- a/Spear.cabal
+++ b/Spear.cabal
@@ -12,63 +12,68 @@ author: Marc Sunet
 data-dir: ""
 library
-    build-depends: GLFW-b -any,
+    build-depends:
-                   OpenGL >= 3,
+      GLFW-b -any,
-                   OpenGLRaw -any,
+      OpenGL >= 3,
-                   StateVar -any,
+      OpenGLRaw -any,
-                   base -any,
+      StateVar -any,
-                   bytestring -any,
+      base -any,
-                   directory -any,
+      bytestring -any,
-                   exceptions -any,
+      directory -any,
-                   mtl -any,
+      exceptions -any,
-                   transformers -any,
+      mtl -any,
-                   resourcet -any,
+      transformers -any,
-                   parsec >= 3,
+      resourcet -any,
-                   containers -any,
+      parsec >= 3,
-                   vector -any,
+      containers -any,
-                   array -any
+      vector -any,
+      array -any
-    exposed-modules: Spear.App
+    exposed-modules:
-                     Spear.Assets.Image
+      Spear.App
-                     Spear.Assets.Model
+      Spear.Assets.Image
-                     Spear.Game
+      Spear.Assets.Model
-                     Spear.GL
+      Spear.Game
-                     Spear.Math.AABB
+      Spear.GL
-                     Spear.Math.Camera
+      Spear.Math.AABB
-                     Spear.Math.Circle
+      Spear.Math.Algebra
-                     Spear.Math.Collision
+      Spear.Math.Camera
-                     Spear.Math.Frustum
+      Spear.Math.Circle
-                     Spear.Math.Matrix3
+      Spear.Math.Collision
-                     Spear.Math.Matrix4
+      Spear.Math.Frustum
-                     Spear.Math.MatrixUtils
+      Spear.Math.Matrix3
-                     Spear.Math.Octree
+      Spear.Math.Matrix4
-                     Spear.Math.Plane
+      Spear.Math.MatrixUtils
-                     Spear.Math.Quaternion
+      Spear.Math.Octree
-                     Spear.Math.Ray
+      Spear.Math.Plane
-                     Spear.Math.Segment
+      Spear.Math.Quaternion
-                     Spear.Math.Spatial2
+      Spear.Math.Ray
-                     Spear.Math.Spatial3
+      Spear.Math.Segment
-                     Spear.Math.Sphere
+      Spear.Math.Spatial
-                     Spear.Math.Triangle
+      Spear.Math.Spatial2
-                     Spear.Math.Utils
+      Spear.Math.Spatial3
-                     Spear.Math.Vector
+      Spear.Math.Sphere
-                     Spear.Math.Vector.Vector
+      Spear.Math.Triangle
-                     Spear.Math.Vector.Vector2
+      Spear.Math.Utils
-                     Spear.Math.Vector.Vector3
+      Spear.Math.Vector
-                     Spear.Math.Vector.Vector4
+      Spear.Math.Vector.Vector
-                     Spear.Render.AnimatedModel
+      Spear.Math.Vector.Vector2
-                     Spear.Render.Material
+      Spear.Math.Vector.Vector3
-                     Spear.Render.Model
+      Spear.Math.Vector.Vector4
-                     Spear.Render.Program
+      Spear.Prelude
-                     Spear.Render.StaticModel
+      Spear.Render.AnimatedModel
-                     Spear.Scene.Graph
+      Spear.Render.Material
-                     Spear.Scene.Loader
+      Spear.Render.Model
-                     Spear.Scene.SceneResources
+      Spear.Render.Program
-                     Spear.Step
+      Spear.Render.StaticModel
-                     Spear.Sys.Store
+      Spear.Scene.Graph
-                     Spear.Sys.Store.ID
+      Spear.Scene.Loader
-                     Spear.Sys.Timer
+      Spear.Scene.SceneResources
-                     Spear.Window
+      Spear.Step
+      Spear.Sys.Store
+      Spear.Sys.Store.ID
+      Spear.Sys.Timer
+      Spear.Window
    exposed: True
@@ -87,28 +92,28 @@ library
               Spear/Render/RenderModel.c
               Spear/Sys/Timer/ctimer.c
-    extensions: TypeFamilies
+    includes:
+      Spear/Assets/Image/BMP/BMP_load.h
+      Spear/Assets/Image/Image.h
+      Spear/Assets/Image/Image_error_code.h
+      Spear/Assets/Image/sys_types.h
+      Spear/Assets/Model/MD2/MD2_load.h
+      Spear/Assets/Model/OBJ/OBJ_load.h
+      Spear/Assets/Model/OBJ/cvector.h
+      Spear/Assets/Model/Model.h
+      Spear/Assets/Model/Model_error_code.h
+      Spear/Assets/Model/sys_types.h
+      Spear/Render/RenderModel.h
+      Timer/Timer.h
-    includes: Spear/Assets/Image/BMP/BMP_load.h
+    include-dirs:
-              Spear/Assets/Image/Image.h
+      .
-              Spear/Assets/Image/Image_error_code.h
+      Spear
-              Spear/Assets/Image/sys_types.h
+      Spear/Assets/Image
-              Spear/Assets/Model/MD2/MD2_load.h
+      Spear/Assets/Image/BMP
-              Spear/Assets/Model/OBJ/OBJ_load.h
+      Spear/Assets/Model
-              Spear/Assets/Model/OBJ/cvector.h
+      Spear/Render
-              Spear/Assets/Model/Model.h
+      Spear/Sys
-              Spear/Assets/Model/Model_error_code.h
-              Spear/Assets/Model/sys_types.h
-              Spear/Render/RenderModel.h
-              Timer/Timer.h
-    include-dirs: .
-                  Spear
-                  Spear/Assets/Image
-                  Spear/Assets/Image/BMP
-                  Spear/Assets/Model
-                  Spear/Render
-                  Spear/Sys
    hs-source-dirs: .

diff --git a/Spear.cabal b/Spear.cabal index 7025fcd..448f7f4 100644 --- a/Spear.cabal +++ b/Spear.cabal
@@ -12,63 +12,68 @@ author: Marc Sunet
12	data-dir: ""	12	data-dir: ""
13		13
14	library	14	library
15	build-depends: GLFW-b -any,	15	build-depends:
16	OpenGL >= 3,	16	GLFW-b -any,
17	OpenGLRaw -any,	17	OpenGL >= 3,
18	StateVar -any,	18	OpenGLRaw -any,
19	base -any,	19	StateVar -any,
20	bytestring -any,	20	base -any,
21	directory -any,	21	bytestring -any,
22	exceptions -any,	22	directory -any,
23	mtl -any,	23	exceptions -any,
24	transformers -any,	24	mtl -any,
25	resourcet -any,	25	transformers -any,
26	parsec >= 3,	26	resourcet -any,
27	containers -any,	27	parsec >= 3,
28	vector -any,	28	containers -any,
29	array -any	29	vector -any,
		30	array -any
30		31
31	exposed-modules: Spear.App	32	exposed-modules:
32	Spear.Assets.Image	33	Spear.App
33	Spear.Assets.Model	34	Spear.Assets.Image
34	Spear.Game	35	Spear.Assets.Model
35	Spear.GL	36	Spear.Game
36	Spear.Math.AABB	37	Spear.GL
37	Spear.Math.Camera	38	Spear.Math.AABB
38	Spear.Math.Circle	39	Spear.Math.Algebra
39	Spear.Math.Collision	40	Spear.Math.Camera
40	Spear.Math.Frustum	41	Spear.Math.Circle
41	Spear.Math.Matrix3	42	Spear.Math.Collision
42	Spear.Math.Matrix4	43	Spear.Math.Frustum
43	Spear.Math.MatrixUtils	44	Spear.Math.Matrix3
44	Spear.Math.Octree	45	Spear.Math.Matrix4
45	Spear.Math.Plane	46	Spear.Math.MatrixUtils
46	Spear.Math.Quaternion	47	Spear.Math.Octree
47	Spear.Math.Ray	48	Spear.Math.Plane
48	Spear.Math.Segment	49	Spear.Math.Quaternion
49	Spear.Math.Spatial2	50	Spear.Math.Ray
50	Spear.Math.Spatial3	51	Spear.Math.Segment
51	Spear.Math.Sphere	52	Spear.Math.Spatial
52	Spear.Math.Triangle	53	Spear.Math.Spatial2
53	Spear.Math.Utils	54	Spear.Math.Spatial3
54	Spear.Math.Vector	55	Spear.Math.Sphere
55	Spear.Math.Vector.Vector	56	Spear.Math.Triangle
56	Spear.Math.Vector.Vector2	57	Spear.Math.Utils
57	Spear.Math.Vector.Vector3	58	Spear.Math.Vector
58	Spear.Math.Vector.Vector4	59	Spear.Math.Vector.Vector
59	Spear.Render.AnimatedModel	60	Spear.Math.Vector.Vector2
60	Spear.Render.Material	61	Spear.Math.Vector.Vector3
61	Spear.Render.Model	62	Spear.Math.Vector.Vector4
62	Spear.Render.Program	63	Spear.Prelude
63	Spear.Render.StaticModel	64	Spear.Render.AnimatedModel
64	Spear.Scene.Graph	65	Spear.Render.Material
65	Spear.Scene.Loader	66	Spear.Render.Model
66	Spear.Scene.SceneResources	67	Spear.Render.Program
67	Spear.Step	68	Spear.Render.StaticModel
68	Spear.Sys.Store	69	Spear.Scene.Graph
69	Spear.Sys.Store.ID	70	Spear.Scene.Loader
70	Spear.Sys.Timer	71	Spear.Scene.SceneResources
71	Spear.Window	72	Spear.Step
		73	Spear.Sys.Store
		74	Spear.Sys.Store.ID
		75	Spear.Sys.Timer
		76	Spear.Window
72		77
73	exposed: True	78	exposed: True
74		79
@@ -87,28 +92,28 @@ library
87	Spear/Render/RenderModel.c	92	Spear/Render/RenderModel.c
88	Spear/Sys/Timer/ctimer.c	93	Spear/Sys/Timer/ctimer.c
89		94
90	extensions: TypeFamilies	95	includes:
		96	Spear/Assets/Image/BMP/BMP_load.h
		97	Spear/Assets/Image/Image.h
		98	Spear/Assets/Image/Image_error_code.h
		99	Spear/Assets/Image/sys_types.h
		100	Spear/Assets/Model/MD2/MD2_load.h
		101	Spear/Assets/Model/OBJ/OBJ_load.h
		102	Spear/Assets/Model/OBJ/cvector.h
		103	Spear/Assets/Model/Model.h
		104	Spear/Assets/Model/Model_error_code.h
		105	Spear/Assets/Model/sys_types.h
		106	Spear/Render/RenderModel.h
		107	Timer/Timer.h
91		108
92	includes: Spear/Assets/Image/BMP/BMP_load.h	109	include-dirs:
93	Spear/Assets/Image/Image.h	110	.
94	Spear/Assets/Image/Image_error_code.h	111	Spear
95	Spear/Assets/Image/sys_types.h	112	Spear/Assets/Image
96	Spear/Assets/Model/MD2/MD2_load.h	113	Spear/Assets/Image/BMP
97	Spear/Assets/Model/OBJ/OBJ_load.h	114	Spear/Assets/Model
98	Spear/Assets/Model/OBJ/cvector.h	115	Spear/Render
99	Spear/Assets/Model/Model.h	116	Spear/Sys
100	Spear/Assets/Model/Model_error_code.h
101	Spear/Assets/Model/sys_types.h
102	Spear/Render/RenderModel.h
103	Timer/Timer.h
104
105	include-dirs: .
106	Spear
107	Spear/Assets/Image
108	Spear/Assets/Image/BMP
109	Spear/Assets/Model
110	Spear/Render
111	Spear/Sys
112		117
113	hs-source-dirs: .	118	hs-source-dirs: .
114		119