Merge remote-tracking branch 'origin/Importer' into Animations

# Conflicts: # include/Engine/Rendering/Skeleton.h # src/Engine/Rendering/RawModelCustom.cpp # src/Engine/Rendering/Skeleton.cpp
2016-02-04 11:32:44 +01:00
parent 6aec7555cc afa4f425a8
commit 2733efdc0d
11 changed files with 295 additions and 144 deletions
@@ -54,24 +54,22 @@ public:
 		{
 			struct BoneProperty
 			{
-				int ID;
                glm::vec3 Position;
                glm::quat Rotation;
 				glm::vec3 Scale = glm::vec3(1);
 			};

-			int Index = 0;
-			double Time = 0.0;
-			std::map<int, Keyframe::BoneProperty> BoneProperties;
+            int Index = 0;
+            double Time = 0.0;
+            BoneProperty BoneProperties;
            //Keyframe::BoneProperty boneProperty;
 		};
-
-		std::string Name;
-		double Duration;
-       // unsigned int KeyFrameAmount;
-		std::vector<Keyframe> Keyframes;
-        //std::map<int, std::list<Keyframe>> BoneKeyFrames;
-        
+        std::string Name;
+        double Duration;
+        std::map<int, std::vector<Keyframe>> JointAnimations;
+		
+		
+		 
 	};

 	Skeleton() { }