Animations PROBABLY works fine if all joints got keyframes.

include/Engine/Collision/Collision.h

@@ -10,8 +10,8 @@
 
 #include "../Core/Ray.h"
 #include "../Core/AABB.h"
-//#include "Engine/Rendering/RawModelAssimp.h"
-#include "Engine/Rendering/RawModelCustom.h"
+#include "Rendering/RawModelCustom.h"
+//#include "Rendering/RawModelAssimp.h"
 #include "../Core/Transform.h"
 #include "../Core/Entity.h"
 #include "../Core/EntityWrapper.h"

include/Engine/Rendering/DebugCameraInputController.h

@@ -61,6 +61,6 @@ public:
 protected:
     glm::vec3 m_Position = glm::vec3(0, 0, 0);
     glm::vec3 m_Velocity = glm::vec3(0, 0, 0);
-    float m_BaseSpeed = 2.0f;
+    float m_BaseSpeed = 50.0f;//2.0f;
     float m_Speed = m_BaseSpeed;
 };

include/Engine/Rendering/Model.h

@@ -1,7 +1,8 @@
 #ifndef Model_h__
 #define Model_h__
 
-#include "RawModelCustom.h"
+#include "Rendering/RawModelCustom.h"
+//#include "Rendering/RawModelAssimp.h"
 #include "../OpenGL.h"
 
 class Model : public ThreadUnsafeResource

include/Engine/Rendering/RawModelAssimp.h

@@ -1,6 +1,8 @@
 #ifndef RawModelAssimp_h__
 #define RawModelAssimp_h__
 
+#ifdef USING_ASSIMP_AS_IMPORTER
+
 #include <fstream>
 #include <iostream>
 #include <sstream>
@@ -18,15 +20,17 @@
 #include "Texture.h"
 #include "Skeleton.h"
 
-class RawModel : public Resource
+#define RawModel RawModelAssimp
+
+class RawModelAssimp : public Resource
 {
 	friend class ResourceManager;
 
 protected:
-    RawModel(std::string fileName);
+    RawModelAssimp(std::string fileName);
 
 public:
-	~RawModel();
+	~RawModelAssimp();
 
 	struct Vertex
 	{
@@ -72,3 +76,4 @@ private:
 };
 
 #endif
+#endif

include/Engine/Rendering/RawModelCustom.h

@@ -1,6 +1,10 @@
 #ifndef RawModelCustom_h__
 #define RawModelCustom_h__
 
+#ifndef USING_ASSIMP_AS_IMPORTER
+
+#define RawModel RawModelCustom
+
 #include <fstream>
 #include <iostream>
 #include <sstream>
@@ -17,15 +21,17 @@
 
 #include "boost\endian\buffers.hpp"
 
-class RawModel : public Resource
+
+
+class RawModelCustom : public Resource
 {
     friend class ResourceManager;
 
 protected:
-    RawModel(std::string fileName);
+    RawModelCustom(std::string fileName);
 
 public:
-    ~RawModel();
+    ~RawModelCustom();
     
     struct Vertex
     {
@@ -85,4 +91,9 @@ private:
     //void CreateSkeleton(std::vector<std::tuple<std::string, glm::mat4>> &boneInfo, std::map<std::string, int> &boneNameMapping, aiNode* node, int parentID);
 };
 
+#else
+
+#include "RawModelAssimp.h"
+
 #endif
+#endif

include/Engine/Rendering/Skeleton.h

@@ -4,6 +4,7 @@
 #include <sstream>
 #include "Common.h"
 #include "../GLM.h"
+#include <glm/gtx/matrix_decompose.hpp>
 
 //struct Bone
 //{