Merge pull request #61 from klaussilveira/feat/md5

Added support for MD5v11 (ETQW) and MD5v12 (Storm Engine 2)

Author: codereader

radiantcore/model/md5/MD5Anim.cpp

@@ -147,10 +147,10 @@ void MD5Anim::parseFromTokens(parser::DefTokeniser& tok)
 
 		int version = string::convert<int>(tok.nextToken());
 
-		if (version != 10)
+		if (version != 10 && version != 11 && version != 12)
 		{
-			rWarning() << "Unexpected version encountered: " << version 
-				<< " (expected 10), will attempt to load anyway." << std::endl;
+			rWarning() << "Unexpected MD5 version encountered: " << version
+				<< " (expected 10, 11, or 12), will attempt to load anyway." << std::endl;
 		}
 
 		tok.assertNextToken("commandline");

radiantcore/model/md5/MD5Model.cpp

@@ -205,7 +205,12 @@ void MD5Model::parseFromTokens(parser::DefTokeniser& tok)
 
 	// Check the version number
 	tok.assertNextToken("MD5Version");
-	tok.assertNextToken("10");
+	int version = string::convert<int>(tok.nextToken());
+
+	if (version != 10 && version != 11 && version != 12)
+	{
+		throw parser::ParseException("Unsupported MD5Version: " + std::to_string(version));
+	}
 
 	// Commandline
 	tok.assertNextToken("commandline");
@@ -268,7 +273,7 @@ void MD5Model::parseFromTokens(parser::DefTokeniser& tok)
 		// Construct the surface for this mesh
 		MD5Surface& surface = createNewSurface();
 
-		surface.parseFromTokens(tok);
+		surface.parseFromTokens(tok, version);
 
 		// Build the index array - this has to happen at least once
 		surface.buildIndexArray();

radiantcore/model/md5/MD5Surface.cpp

@@ -294,7 +294,7 @@ void MD5Surface::buildIndexArray()
 	}
 }
 
-void MD5Surface::parseFromTokens(parser::DefTokeniser& tok)
+void MD5Surface::parseFromTokens(parser::DefTokeniser& tok, int version)
 {
 	// Start of datablock
 	tok.assertNextToken("mesh");
@@ -303,10 +303,25 @@ void MD5Surface::parseFromTokens(parser::DefTokeniser& tok)
 	// Get the reference to the mesh definition
 	MD5Mesh& mesh = *_mesh;
 
+	// v11 may have an optional "name" field before shader
+	if (tok.peek() == "name")
+	{
+		tok.nextToken(); // "name"
+		tok.nextToken(); // skip the name string
+	}
+
 	// Get the shader name
 	tok.assertNextToken("shader");
 	setDefaultMaterial(tok.nextToken());
 
+	// v11 may have an optional "flags { ... }" block
+	if (tok.peek() == "flags")
+	{
+		tok.nextToken(); // "flags"
+		tok.assertNextToken("{");
+		while (tok.nextToken() != "}") {} // skip until closing brace
+	}
+
 	// ----- VERTICES ------
 
 	// Read the vertex count
@@ -335,6 +350,27 @@ void MD5Surface::parseFromTokens(parser::DefTokeniser& tok)
 		vt->weight_index = string::convert<std::size_t>(tok.nextToken());
 		vt->weight_count = string::convert<std::size_t>(tok.nextToken());
 
+		if (version == 11)
+		{
+			// v11: optional per-vertex RGBA as ( R G B A )
+			if (tok.peek() == "(")
+			{
+				tok.nextToken(); // "("
+				tok.skipTokens(4); // R G B A
+				tok.assertNextToken(")");
+			}
+		}
+		else if (version == 12)
+		{
+			// v12: per-vertex normal ( nx ny nz ) and tangent ( tx ty tz tw )
+			tok.assertNextToken("(");
+			tok.skipTokens(3); // nx ny nz
+			tok.assertNextToken(")");
+			tok.assertNextToken("(");
+			tok.skipTokens(4); // tx ty tz tw
+			tok.assertNextToken(")");
+		}
+
 	} // for each vertex
 
 	// ------  TRIANGLES ------
@@ -385,6 +421,21 @@ void MD5Surface::parseFromTokens(parser::DefTokeniser& tok)
 
 	} // for each weight
 
+	// v12: optional vertex colors block
+	if (version == 12 && tok.peek() == "numvertexcolors")
+	{
+		tok.nextToken(); // "numvertexcolors"
+		std::size_t numColors = string::convert<std::size_t>(tok.nextToken());
+		for (std::size_t i = 0; i < numColors; ++i)
+		{
+			tok.assertNextToken("vertexcolor");
+			tok.skipTokens(1); // index
+			tok.assertNextToken("(");
+			tok.skipTokens(4); // R G B A
+			tok.assertNextToken(")");
+		}
+	}
+
 	// ----- END OF MESH DECL -----
 
 	tok.assertNextToken("}");

radiantcore/model/md5/MD5Surface.h

@@ -89,7 +89,7 @@ class MD5Surface final :
 
     const AABB& getSurfaceBounds() const override;
 
-	void parseFromTokens(parser::DefTokeniser& tok);
+	void parseFromTokens(parser::DefTokeniser& tok, int version = 10);
 
 	// Rebuild the render index array - usually needs to be called only once
 	void buildIndexArray();