fix Issue 132: Small fix from compiling blender - collada with -Wall …

…-Werror
KhronosGroup · Nov 4, 2010 · 309c0e8 · 309c0e8
1 parent 567bd02
commit 309c0e8
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 16 deletions.
diff --git a/COLLADAFramework/include/COLLADAFWFileInfo.h b/COLLADAFramework/include/COLLADAFWFileInfo.h
@@ -239,12 +239,12 @@ namespace COLLADAFW
         to the right, and which is considered inward. */
         UpAxisType mUpAxisType;
 
-		/** The absolute file uri.*/
-		COLLADABU::URI mAbsoluteFileUri;
-
         /** A pair where you can hold file informations. */
         ValuePairPointerArray mValuePairArray;
 
+		/** The absolute file uri.*/
+		COLLADABU::URI mAbsoluteFileUri;
+
 	public:
 
         /** Constructor. */

diff --git a/COLLADAFramework/include/COLLADAFWMorphController.h b/COLLADAFramework/include/COLLADAFWMorphController.h
@@ -24,6 +24,9 @@ namespace COLLADAFW
 	{
 	private:
 
+		/** The morph weights.*/
+		FloatOrDoubleArray mMorphWeights;
+
         /**
         * The original object id, if it in the original file format exist. 
         */
@@ -35,8 +38,6 @@ namespace COLLADAFW
 		/** The unique ids of the morph targets (geometries).*/
 		UniqueIdArray mMorphTargets;
 
-		/** The morph weights.*/
-		FloatOrDoubleArray mMorphWeights;
 
 	public:
 

diff --git a/COLLADAFramework/src/COLLADAFWNode.cpp b/COLLADAFramework/src/COLLADAFWNode.cpp
@@ -78,6 +78,10 @@ namespace COLLADAFW
 					transformationMatrix = transformationMatrix * matrix->getMatrix();
 					break;
 				}
+			case Transformation::LOOKAT:
+				break; /** @TODO unhandled case */
+			case Transformation::SKEW:
+				break; /** @TODO unhandled case */
 			}
 
 		}

diff --git a/COLLADAFramework/src/COLLADAFWValidate.cpp b/COLLADAFramework/src/COLLADAFWValidate.cpp
@@ -137,7 +137,7 @@ namespace COLLADAFW
 
 		for ( size_t i = 0, count = jointIndices.getCount(); i < count; ++i)
 		{
-			if ( jointIndices[i] >= jointsCount)
+			if ( (unsigned int)abs(jointIndices[i]) >= jointsCount)
 				return false;
 		}
 		return true;

diff --git a/COLLADASaxFrameworkLoader/include/COLLADASaxFWLKinematicsIntermediateData.h b/COLLADASaxFrameworkLoader/include/COLLADASaxFWLKinematicsIntermediateData.h
@@ -248,6 +248,8 @@ namespace COLLADASaxFWL
 			case VALUETYPE_SIDREF: 
 				mValue._sidref = 0;
 				break;
+			case VALUETYPE_UNKNOWN:
+				break;
 			}
 		}
 
@@ -623,7 +625,7 @@ namespace COLLADASaxFWL
 		float getFloatValue() const { return mValue._float; }
 
 		/** Sets the sidref value FloatOrParam. Type will be set to VALUETYPE_FLOAT.*/
-		void setFloatValue( float value) { deleteParam(); mValue._float; mValueType = VALUETYPE_FLOAT; }
+		void setFloatValue( float value) { deleteParam(); mValue._float=value; mValueType = VALUETYPE_FLOAT; }
 
 		/** Returns the param ref FloatOrParam. Type must be VALUETYPE_PARAM.*/
 		const String* getParamValue() const { return mValue._param; }

diff --git a/COLLADASaxFrameworkLoader/include/COLLADASaxFWLSource.h b/COLLADASaxFrameworkLoader/include/COLLADASaxFWLSource.h
@@ -84,6 +84,12 @@ namespace COLLADASaxFWL
         */
         unsigned long long mStride; 
 
+        /**
+         * This member will be used, if multiple source elements with the same input semantic are
+         * referenced in the current mesh. 
+         */
+        size_t mInitialIndex;
+
         /**
          * Flags, if the source element is already loaded into the framework. A source element 
          * can be referenced from the same input element in multiple primitive elements or from
@@ -92,12 +98,6 @@ namespace COLLADASaxFWL
          */
         COLLADAFW::ArrayPrimitiveType<InputSemantic::Semantic> mLoadedInputElements;
 
-        /**
-         * This member will be used, if multiple source elements with the same input semantic are
-         * referenced in the current mesh. 
-         */
-        size_t mInitialIndex;
-
 		/** The accessor of the source.*/
 		Accessor mAccessor;
 

diff --git a/COLLADASaxFrameworkLoader/src/COLLADASaxFWLFormulasLinker.cpp b/COLLADASaxFrameworkLoader/src/COLLADASaxFWLFormulasLinker.cpp
@@ -255,7 +255,7 @@ namespace COLLADASaxFWL
 			{
 				//search for the parameter name in the formulas new params
 				bool found = false;
-				size_t newParamIndex = getNewParamIndex(formula, *csymbolName, found);
+				// UNUSED size_t newParamIndex = getNewParamIndex(formula, *csymbolName, found);
 				if ( found )
 				{
 					// we are done. create new VariableExpression and return

diff --git a/COLLADASaxFrameworkLoader/src/COLLADASaxFWLKinematicsSceneCreator.cpp b/COLLADASaxFrameworkLoader/src/COLLADASaxFWLKinematicsSceneCreator.cpp
@@ -155,7 +155,7 @@ namespace COLLADASaxFWL
 	{
 		COLLADAFW::KinematicsModel::LinkJointConnections& linkJointConnections = fwKinematicsModel->getLinkJointConnections();
 
-		const TransformationList& linkTransformations = link->getTransformations();
+		//TODO UNUSED const TransformationList& linkTransformations = link->getTransformations();
 
 		const KinematicAttachmentList& attachments = link->getAttachments();
 		KinematicAttachmentList::const_iterator it = attachments.begin();
@@ -243,7 +243,7 @@ namespace COLLADASaxFWL
 	{
 		COLLADAFW::KinematicsModel::LinkJointConnections& linkJointConnections = fwKinematicsModel->getLinkJointConnections();
 
-		const TransformationList& linkTransformations = attachment->getTransformations();
+		// @TODO UNUSED const TransformationList& linkTransformations = attachment->getTransformations();
 
 		mLinkNumberStack.push(mLargestLinkNumber++);