Merge pull request #468 from bagobor/master

-fixed crash with skeletal animation sample: added key clamping to Quate...

Core/Contents/Include/PolyBone.h

@@ -40,7 +40,7 @@ namespace Polycode {
 			* Constructor.
 			* @param boneName Name of the bone.
 			*/				
-			Bone(const String& boneName);
+			explicit Bone(const String& boneName);
 			virtual ~Bone();
 			
 			/**

Core/Contents/Include/PolyCamera.h

@@ -66,7 +66,7 @@ namespace Polycode {
 			* Constructor.
 			* @param parentScene Scene to add the camera to.
 			*/
-			Camera(Scene *parentScene);
+			explicit Camera(Scene *parentScene);
 			virtual ~Camera();
 			
             /**

Core/Contents/Include/PolyGLVertexBuffer.h

@@ -42,7 +42,7 @@ namespace Polycode {
 	class _PolyExport OpenGLVertexBuffer : public VertexBuffer {
 	public:
 		
-		OpenGLVertexBuffer(Mesh *mesh);
+		explicit OpenGLVertexBuffer(Mesh *mesh);
 		virtual ~OpenGLVertexBuffer();
 		
 		GLuint getVertexBufferID();		

Core/Contents/Include/PolyImage.h

@@ -39,7 +39,7 @@ namespace Polycode {
 			* Create image from file name.
 			* @param fileName Path to image file to load.
 			*/ 
-			Image(const String& fileName);
+			explicit Image(const String& fileName);
 			
 			/**
 			* Create a blank image of specified size and type.

Core/Contents/Include/PolyMaterial.h

@@ -35,7 +35,7 @@ namespace Polycode {
 
 	class _PolyExport Material : public Resource {
 		public:
-			Material(const String& name);
+			explicit Material(const String& name);
 			virtual ~Material();
 			
 			void addShader(Shader *shader,ShaderBinding *shaderBinding);

Core/Contents/Include/PolyMesh.h

@@ -120,13 +120,13 @@ namespace Polycode {
 			* Construct with an empty mesh of specified type.
 			* @param meshType Type of mesh. Possible values are: Mesh::QUAD_MESH, Mesh::TRI_MESH, Mesh::TRIFAN_MESH, Mesh::TRISTRIP_MESH, Mesh::LINE_MESH, Mesh::POINT_MESH.
 			*/			
-			Mesh(int meshType);
+			explicit Mesh(int meshType);
 					
 			/**
 			* Construct from a mesh loaded from a file.
 			* @param fileName Path to mesh file.
 			*/
-			Mesh(const String& fileName);
+			explicit Mesh(const String& fileName);
 
 			/**
 			* Construct from a mesh loaded from a file.

Core/Contents/Include/PolySceneEntityInstance.h

@@ -42,7 +42,7 @@ class SceneEntityInstance : public Entity {
 	public:
     
         SceneEntityInstance(Scene *parentScene, const String& fileName);
-		SceneEntityInstance(Scene *parentScene);
+		explicit SceneEntityInstance(Scene *parentScene);
 		
 		static SceneEntityInstance *BlankSceneEntityInstance(Scene *parentScene);
 

Core/Contents/Include/PolySceneImage.h

@@ -36,19 +36,19 @@ namespace Polycode {
 		* Create screen image from file.
 		* @param fileName 
 		*/
-		SceneImage(const String& fileName);
+		explicit SceneImage(const String& fileName);
 
 		/**
 		* Create screen image from Image.
 		* @param image Image to create from.
 		*/		
-		SceneImage(Image *image);		
+		explicit SceneImage(Image *image);
 
 		/**
 		 * Create screen image from Texture.
 		 * @param texture Texture to create from.
 		 */		
-		SceneImage(Texture *texture);		
+		explicit SceneImage(Texture *texture);
 
 		/**
 		* Create screen image from Image.

Core/Contents/Include/PolySceneMesh.h

@@ -44,18 +44,18 @@ namespace Polycode {
 			* Construct a scene mesh from a mesh file.
 			* @param fileName Path to mesh file to load.
 			*/
-			SceneMesh(const String& fileName);
+			explicit SceneMesh(const String& fileName);
 			
 			/**
 			* Construct an empty scene mesh with the specified type.
 			* @param meshType Mesh type to create. See Mesh for possible values.
 			*/			
-			SceneMesh(int meshType);		
+			explicit SceneMesh(int meshType);
 			
 			/**
 			* Construct scene mesh from an existing Mesh instance.
 			*/
-			SceneMesh(Mesh *mesh);
+			explicit SceneMesh(Mesh *mesh);
 			
 			/**
 			* Construct scene mesh from an existing Mesh instance.

Core/Contents/Include/PolyShader.h

@@ -64,7 +64,7 @@ namespace Polycode {
 
 	class _PolyExport ShaderProgram : public Resource {
 		public:
-			ShaderProgram(int type);
+			explicit ShaderProgram(int type);
 			virtual ~ShaderProgram();
 			
 			virtual void reloadProgram() {}
@@ -80,7 +80,7 @@ namespace Polycode {
 
 	class _PolyExport Shader : public Resource {
 		public:
-			Shader(int type);
+			explicit Shader(int type);
 			virtual ~Shader();
 
 			int getType() const;

Core/Contents/Source/PolyQuaternionCurve.cpp

@@ -62,12 +62,12 @@ void QuaternionCurve::generatePointsFromCurves(BezierCurve *wCurve, BezierCurve
 
 Quaternion QuaternionCurve::interpolate(Number t, bool useShortestPath)
 {
-        Number fSeg = t * (tPoints.size() - 1);
-        unsigned int segIdx = (unsigned int)fSeg;
-        t = fSeg - segIdx;
-
-        return interpolate(segIdx, t, useShortestPath);
+	t = std::min(std::max(t, 0.0), 1.0);
+    Number fSeg = t * (tPoints.size() - 1);
+    unsigned int segIdx = (unsigned int)fSeg;
+    t = fSeg - segIdx;
 
+    return interpolate(segIdx, t, useShortestPath);
 }
 
 Quaternion QuaternionCurve::interpolate(unsigned int fromIndex, Number t, bool useShortestPath) {