Browse Source

- FBX: avoid more gcc warnings.

Alexander Gessler 12 years ago
parent
commit
a288a631e2
3 changed files with 7 additions and 8 deletions
  1. 1 1
      code/FBXBinaryTokenizer.cpp
  2. 3 4
      code/FBXConverter.cpp
  3. 3 3
      code/FBXDocument.cpp

+ 1 - 1
code/FBXBinaryTokenizer.cpp

@@ -380,7 +380,7 @@ void TokenizeBinary(TokenList& output_tokens, const char* input, unsigned int le
 	}
 
 
-	uint32_t offset = 0x1b;
+	//uint32_t offset = 0x1b;
 
 	const char* cursor = input + 0x1b;
 

+ 3 - 4
code/FBXConverter.cpp

@@ -97,9 +97,9 @@ public:
 public:
 
 	Converter(aiScene* out, const Document& doc)
-		: out(out) 
+		: defaultMaterialIndex()
+		, out(out) 
 		, doc(doc)
-		, defaultMaterialIndex()
 	{
 		// animations need to be converted first since this will
 		// populate the node_anim_chain_bits map, which is needed
@@ -1171,7 +1171,6 @@ private:
 				ai_assert(cluster);
 
 				const WeightIndexArray& indices = cluster->GetIndices();
-				const WeightArray& weights = cluster->GetWeights();
 
 				if(indices.empty()) {
 					continue;
@@ -1198,7 +1197,7 @@ private:
 					count_out_indices.push_back(0);
 
 					for(unsigned int i = 0; i < count; ++i) {					
-						if (no_mat_check || mats[geo.FaceForVertexIndex(out_idx[i])] == materialIndex) {
+						if (no_mat_check || static_cast<size_t>(mats[geo.FaceForVertexIndex(out_idx[i])]) == materialIndex) {
 							
 							if (index_out_indices.back() == no_index_sentinel) {
 								index_out_indices.back() = out_indices.size();

+ 3 - 3
code/FBXDocument.cpp

@@ -231,8 +231,8 @@ Object::~Object()
 
 // ------------------------------------------------------------------------------------------------
 FileGlobalSettings::FileGlobalSettings(const Document& doc, boost::shared_ptr<const PropertyTable> props)
-: doc(doc)
-, props(props)
+: props(props)
+, doc(doc) 
 {
 
 }
@@ -579,7 +579,7 @@ std::vector<const Connection*> Document::GetConnectionsSequenced(uint64_t id, bo
 
 		for (size_t i = 0; i < c; ++i) {
 			ai_assert(classnames[i]);
-			if(std::distance(key.begin(),key.end()) == lenghts[i] && !strncmp(classnames[i],obtype,lenghts[i])) {
+			if(static_cast<size_t>(std::distance(key.begin(),key.end())) == lenghts[i] && !strncmp(classnames[i],obtype,lenghts[i])) {
 				obtype = NULL;
 				break;
 			}