From b1ec5525bcf2fb101c57d93beeba26c8c4420638 Mon Sep 17 00:00:00 2001
From: 3gg <3gg@shellblade.net>
Date: Sun, 4 May 2025 12:06:00 -0700
Subject: Textures WIP

---
 Spear.cabal | 42 +++++++-----------------------------------
 1 file changed, 7 insertions(+), 35 deletions(-)

(limited to 'Spear.cabal')

diff --git a/Spear.cabal b/Spear.cabal
index 56eb302..0be03fe 100644
--- a/Spear.cabal
+++ b/Spear.cabal
@@ -19,6 +19,7 @@ library
       OpenGL >= 3,
       OpenGLRaw -any,
       StateVar -any,
+      --stb-image >= 0.3.0, TODO: Remove
       base -any,
       bytestring -any,
       directory -any,
@@ -37,20 +38,16 @@ library
 
     exposed-modules:
       Spear.App
-      Spear.Assets.Image
-      Spear.Assets.Model
+      Spear.Asset.Image
       Spear.Game
-      Spear.GL
       Spear.Math.AABB
       Spear.Math.Algebra
       Spear.Math.Camera
       Spear.Math.Circle
-      Spear.Math.Collision
       Spear.Math.Frustum
       Spear.Math.Matrix3
       Spear.Math.Matrix4
       Spear.Math.MatrixUtils
-      Spear.Math.Octree
       Spear.Math.Plane
       Spear.Math.Quaternion
       Spear.Math.Ray
@@ -69,7 +66,7 @@ library
       Spear.Physics.Collision
       Spear.Physics.RigidBody
       Spear.Prelude
-      Spear.Render.AnimatedModel
+      Spear.Render.Asset
       Spear.Render.Core
       Spear.Render.Core.Buffer
       Spear.Render.Core.Constants
@@ -77,15 +74,9 @@ library
       Spear.Render.Core.Pipeline
       Spear.Render.Core.Shader
       Spear.Render.Core.State
+      Spear.Render.Core.Texture
       Spear.Render.Immediate
-      Spear.Render.Material
-      Spear.Render.Model
-      Spear.Render.Program
       Spear.Render.Shaders
-      Spear.Render.StaticModel
-      Spear.Scene.Graph
-      Spear.Scene.Loader
-      Spear.Scene.SceneResources
       Spear.Sound.Sound
       Spear.Sound.State
       Spear.Step
@@ -101,36 +92,17 @@ library
     build-tools: hsc2hs -any
 
     c-sources:
-      Spear/Assets/Image/Image.c
-      Spear/Assets/Image/BMP/BMP_load.c
-      Spear/Assets/Model/Model.c
-      Spear/Assets/Model/MD2/MD2_load.c
-      Spear/Assets/Model/OBJ/cvector.c
-      Spear/Assets/Model/OBJ/OBJ_load.c
-      Spear/Render/RenderModel.c
+      Spear/cbits/stb/stb_image.c
       Spear/Sys/Timer/timer.c
 
     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
+      cbits/stb/stb_image.h
       Spear/Sys/Timer/timer.h
 
     include-dirs:
       .
       Spear
-      Spear/Assets/Image
-      Spear/Assets/Image/BMP
-      Spear/Assets/Model
-      Spear/Render
+      Spear/cbits
       Spear/Sys
 
     hs-source-dirs: .
-- 
cgit v1.2.3