Animations PROBABLY works fine if all joints got keyframes.

2016-01-23 18:02:42 +01:00
parent c984f76b2f
commit f1835fd89c
21 changed files with 325 additions and 84 deletions
@@ -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