Add initial animation support to GfxModel

Introduces GfxAnimation and GfxAnimator structures to the model system, and begins parsing animation data from glTF files. Removes borealis-test target and related config from build scripts, and updates external glfw submodule.

Author: UntitledOutput

Makefile

@@ -11,25 +11,14 @@ endif
 ifeq ($(config),debug)
   borealis_config = debug
   resource_packer_config = debug
-  borealis_test_config = debug
   glad_config = debug
   glfw3_config = debug
   stb_config = debug
   glm_config = debug
 
-else ifeq ($(config),debug_(renderdoc))
-  borealis_config = debug_(renderdoc)
-  resource_packer_config = debug_(renderdoc)
-  borealis_test_config = debug_(renderdoc)
-  glad_config = debug_(renderdoc)
-  glfw3_config = debug_(renderdoc)
-  stb_config = debug_(renderdoc)
-  glm_config = debug_(renderdoc)
-
 else ifeq ($(config),release)
   borealis_config = release
   resource_packer_config = release
-  borealis_test_config = release
   glad_config = release
   glfw3_config = release
   stb_config = release
@@ -39,7 +28,7 @@ else
   $(error "invalid configuration $(config)")
 endif
 
-PROJECTS := borealis resource_packer borealis-test glad glfw3 stb glm
+PROJECTS := borealis resource_packer glad glfw3 stb glm
 
 .PHONY: all clean help $(PROJECTS) 
 
@@ -57,12 +46,6 @@ ifneq (,$(resource_packer_config))
 	@${MAKE} --no-print-directory -C . -f resource_packer.make config=$(resource_packer_config)
 endif
 
-borealis-test: borealis glad glfw3 resource_packer
-ifneq (,$(borealis_test_config))
-	@echo "==== Building borealis-test ($(borealis_test_config)) ===="
-	@${MAKE} --no-print-directory -C . -f borealis-test.make config=$(borealis_test_config)
-endif
-
 glad:
 ifneq (,$(glad_config))
 	@echo "==== Building glad ($(glad_config)) ===="
@@ -90,7 +73,6 @@ endif
 clean:
 	@${MAKE} --no-print-directory -C . -f borealis.make clean
 	@${MAKE} --no-print-directory -C . -f resource_packer.make clean
-	@${MAKE} --no-print-directory -C . -f borealis-test.make clean
 	@${MAKE} --no-print-directory -C ext/glad -f Makefile clean
 	@${MAKE} --no-print-directory -C ext/glfw -f Makefile clean
 	@${MAKE} --no-print-directory -C ext/stb -f Makefile clean
@@ -101,15 +83,13 @@ help:
 	@echo ""
 	@echo "CONFIGURATIONS:"
 	@echo "  debug"
-	@echo "  debug_\(renderdoc\)"
 	@echo "  release"
 	@echo ""
 	@echo "TARGETS:"
 	@echo "   all (default)"
 	@echo "   clean"
 	@echo "   borealis"
 	@echo "   resource_packer"
-	@echo "   borealis-test"
 	@echo "   glad"
 	@echo "   glfw3"
 	@echo "   stb"

ext/glad/Makefile

@@ -47,22 +47,15 @@ endef
 ifeq ($(config),debug)
 OBJDIR = build/Debug
 DEFINES += -D_CRT_SECURE_NO_WARNINGS -DDEBUG
-ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -g -std=c11 -Wno-warnings -Wall -fcompare-debug-second
-ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -g -Wno-warnings -Wall -fcompare-debug-second
-ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -m64
-
-else ifeq ($(config),debug_(renderdoc))
-OBJDIR = build/Debug (RenderDoc)
-DEFINES += -D_CRT_SECURE_NO_WARNINGS -DDEBUG
-ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -g -std=c11 -Wno-warnings -Wall -fcompare-debug-second
-ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -g -Wno-warnings -Wall -fcompare-debug-second
+ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -g -std=c11 -Wall -fcompare-debug-second
+ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -g -Wall -fcompare-debug-second
 ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -m64
 
 else ifeq ($(config),release)
 OBJDIR = build/Release
 DEFINES += -D_CRT_SECURE_NO_WARNINGS -DNDEBUG
-ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -std=c11 -Wno-warnings -Wall -fcompare-debug-second
-ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -Wno-warnings -Wall -fcompare-debug-second
+ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -std=c11 -Wall -fcompare-debug-second
+ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -Wall -fcompare-debug-second
 ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -m64 -s
 
 endif

ext/glfw

@@ -104,6 +104,41 @@ namespace brl
         friend GfxModel;
     };
 
+    struct GfxAnimation {
+
+        enum ChannelInterpolation {
+            LINEAR,
+            STEP,
+            CUBICSPLINE
+        };
+
+        enum ChannelType {
+            TRANSLATION,
+            ROTATION,
+            SCALE
+        };
+
+        struct AnimationFrame {
+            float time;
+        };
+
+        struct Vec3AnimationFrame : AnimationFrame {
+            glm::vec3 value;
+        };
+
+        struct Channel {
+            int boneIndex;
+            ChannelInterpolation interpolation;
+            ChannelType type;
+
+            std::vector<AnimationFrame> frames;
+        };
+
+        std::string name;
+
+
+
+    };
 
 
     struct GfxModel {
@@ -112,6 +147,7 @@ namespace brl
         std::vector<GfxMaterialDescription*> materialDescriptions;
         std::vector<GfxMaterial*> materials;
         std::vector<GfxSkin*> skins;
+        std::vector<GfxAnimation*> animation;
 
         static GfxModel* loadModel(std::string path);
 
@@ -209,6 +245,16 @@ namespace brl
         GfxModelEntity* model = nullptr;
     };
 
+
+
+    struct GfxAnimator : EcsEntity {
+
+        GfxAnimation* animation;
+
+    private:
+        GfxModelEntity* model= nullptr;
+    };
+
     struct GfxModelEntity : EcsEntity
     {
         std::vector<GfxSkeleton*> skeletons;

include/borealis/gfx/model.hpp

@@ -1,5 +1,2 @@
 make clean
-make -j8 config=debug
-cd out
-.\borealis-test.exe
-cd ../
+make -j8 config=debug

mingw_test.bat

@@ -40,9 +40,7 @@ project "borealis"
 
     prebuildcommands { resource_packer.." ".._SCRIPT_DIR.."/default_assets/ ".._MAIN_SCRIPT_DIR.."/out/default_assets.res" }
 
-    postbuildcommands {
-        "setx BOREALIS_DIR \"".._SCRIPT_DIR .. "\""
-    }
+    postbuildcommands {"setx BOREALIS_DIR \"".._SCRIPT_DIR .. "\""}
 
     links {
         "glad",

projects.lua

@@ -590,6 +590,45 @@ brl::GfxModel::GfxModel(std::string path)
         skins.push_back(s);
     }
 
+    //https://github.com/mikelma/craftium/blob/7594e8af5637cd77da18bd33520a4907b9a19c6d/irr/src/CGLTFMeshFileLoader.cpp#L646
+    //https://github.khronos.org/glTF-Tutorials/gltfTutorial/gltfTutorial_007_Animations.html
+    // https://github.khronos.org/glTF-Tutorials/gltfTutorial/gltfTutorial_006_SimpleAnimation.html
+    // https://github.com/raysan5/raylib/blob/8fa5f1fe2cf7efeda59a5d935a259ccb1cb97f1c/src/rmodels.c#L6347
+    //https://raw.githubusercontent.com/KhronosGroup/glTF/refs/heads/main/specification/2.0/figures/gltfOverview-2.0.0d.png
+
+    for (tinygltf::Animation anim : model.animations) {
+
+        GfxAnimation* animation = new GfxAnimation();
+
+        for (tinygltf::AnimationChannel channel : anim.channels) {
+
+            GfxAnimation::Channel animChannel{};
+
+            tinygltf::AnimationSampler sampler = anim.samplers[channel.sampler];
+
+            int targetBone = -1;
+
+            for (int i = 0; i <model.skins[0].joints.size(); i++) {
+                if (model.skins[0].joints[i] == channel.target_node){
+                    targetBone = i;
+                }
+            }
+
+            if (targetBone == -1)
+                continue;
+
+            if (sampler.interpolation == "LINEAR")
+                animChannel.interpolation = GfxAnimation::LINEAR;
+            if (sampler.interpolation == "STEP")
+                animChannel.interpolation = GfxAnimation::STEP;
+            if (sampler.interpolation == "CUBICSPLINE")
+                animChannel.interpolation = GfxAnimation::CUBICSPLINE;
+            
+            
+        }
+
+        animations.push_back(animation);
+    }
 }
 
 brl::GfxModelNode* brl::GfxModel::processNode(tinygltf::Node aNode, tinygltf::Model scene, int index)