fix mdb

lower case vertex parameter name

Author: AUK233

.gitignore

@@ -47,3 +47,4 @@
 /ModelScale/Debug/*
 /Dxbc2Asm/Release/*
 /Dxbc2Asm/Debug/*
+/x64/*

EDF_Tools/EDF_Tools.vcxproj

@@ -76,6 +76,8 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
+    <IntDir>$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>

EDF_Tools/MDB.cpp

@@ -51,6 +51,9 @@ int CMDBtoXML::Read(const std::wstring& path, bool onecore)
 
 		// Check version
 		GameVersion = ReadInt32(&buffer[0x4], 0);
+		if (GameVersion == 0x20) {
+			xmlHeader->SetAttribute("version", "6");
+		}
 		// Name
 		NameTableCount = ReadInt32(&buffer[0x8], 0);
 		NameTableOffset = ReadInt32(&buffer[0xC], 0);
@@ -820,24 +823,20 @@ MDBObjectLayout CMDBtoXML::ReadObjectLayout(int pos, const std::vector<char>& bu
 {
 	MDBObjectLayout out;
 
-	unsigned char seg[4];
-
-	int position = pos;
-	Read4Bytes(seg, buffer, position);
-	out.type = GetIntFromChunk(seg);
-
-	position = pos + 0x4;
-	Read4Bytes(seg, buffer, position);
-	out.offset = GetIntFromChunk(seg);
-
-	position = pos + 0x8;
-	Read4Bytes(seg, buffer, position);
-	out.channel = GetIntFromChunk(seg);
-
-	position = pos + 0x0C;
-	Read4Bytes(seg, buffer, position);
-	int offset = GetIntFromChunk(seg);
-	out.name = ReadASCII(buffer, pos + offset);
+	out.type = ReadInt32(&buffer[pos], 0);
+	out.offset = ReadInt32(&buffer[pos + 0x4], 0);
+	out.channel = ReadInt32(&buffer[pos + 0x8], 0);
+
+	int offset = ReadInt32(&buffer[pos + 0x0C], 0);
+	std::string name = ReadASCII(buffer, pos + offset);
+	// In case of EDF6, Convert parameter names to lowercase
+	if (GameVersion == 0x20) {
+		// Ignore the skin parameters
+		if ( CompareStringIsSame(name, "BLENDWEIGHT", 12) && CompareStringIsSame(name, "BLENDINDICES", 13) ) {
+			name = ConvertToLower(name);
+		}
+	}
+	out.name = name;
 
 	return out;
 }
@@ -846,25 +845,17 @@ MDBTexture CMDBtoXML::ReadTexture(int pos, const std::vector<char>& buffer)
 {
 	MDBTexture out;
 
-	unsigned char seg[4];
 	int offset = 0;
 
-	int position = pos;
-	Read4Bytes(seg, buffer, position);
-	out.ID = GetIntFromChunk(seg);
+	out.ID = ReadInt32(&buffer[pos], 0);
 
-	position = pos + 0x4;
-	Read4Bytes(seg, buffer, position);
-	offset = GetIntFromChunk(seg);
+	offset = ReadInt32(&buffer[pos + 0x4], 0);
 	out.mapping = ReadUnicode(buffer, pos + offset);
 
-	position = pos + 0x8;
-	Read4Bytes(seg, buffer, position);
-	offset = GetIntFromChunk(seg);
+	offset = ReadInt32(&buffer[pos + 0x8], 0);
 	out.filename = ReadUnicode(buffer, pos + offset);
-	
-	position = pos + 0xC;
-	out.raw = ReadRaw(buffer, position, 4);
+
+	out.raw = ReadRaw(buffer, (pos + 0xC), 4);
 
 	return out;
 }

EDF_Tools/util.cpp

@@ -228,22 +228,15 @@ std::string ReadASCII(const std::vector<char>& chunk, int pos)
 	unsigned int bufPos = pos;
 
 	std::vector< unsigned char > bytes;
-
-	int zeroCount = 0;
-
 	//Repeat until EOF, or otherwise broken
 	while (bufPos < chunk.size())
 	{
 		bytes.push_back(chunk[bufPos]);
 
-		if (chunk[bufPos] == 0x00)
+		if (chunk[bufPos] == 0)
 		{
-			zeroCount++;
-			if (zeroCount == 1)
-				break;
+			break;
 		}
-		else
-			zeroCount = 0;
 		bufPos++;
 	}
 
@@ -405,8 +398,43 @@ float IntHexAsFloat(int in)
 	return out;
 }
 
+// 0 is same, Compares whether two strings are the same.
+int CompareStringIsSame(const std::string& str1, const char* str2, int length)
+{
+	int nonSame = 1;
+	if (str1.size() == length) {
+		for (int i = 0; i < length; i++) {
+			if (str1[i] != str2[i]) {
+				nonSame += i;
+				break;
+			}
+		}
+		nonSame = 0;
+	}
+	return nonSame;
+}
+
 //Converts a string to lower case
-std::wstring ConvertToLower( std::wstring in )
+std::string ConvertToLower(const std::string& in)
+{
+	std::string out;
+	for (int i = 0; i < in.size(); i++)
+	{
+		out += tolower(in[i]);
+		// to upper: in[i] & 0b11011111;
+		/*
+		if (!in[i]) {
+			out += in[i];
+		}
+		else {
+			out += (in[i] | 0b00100000);
+		}*/
+	}
+	return out;
+}
+
+//Converts a wide string to lower case
+std::wstring ConvertToLower(const std::wstring& in )
 {
 	std::wstring out;
 	for( int i = 0; i < in.size( ); ++i )
@@ -417,7 +445,7 @@ std::wstring ConvertToLower( std::wstring in )
 }
 
 //Function to determine "type" of string argument
-ValueType DetermineType( std::wstring input )
+ValueType DetermineType(const std::wstring& input )
 {
 	std::wstring lower = ConvertToLower( input );
 	if( lower == L"true" || lower == L"false" )

EDF_Tools/util.h

@@ -50,8 +50,13 @@ bool IsValidFloat( const std::wstring& input );
 //Converts a int hex to float
 float IntHexAsFloat(int in);
 
+// 0 is same, Compares whether two strings are the same.
+// Why do I need this method to work!
+int CompareStringIsSame(const std::string& str1, const char* str2, int length);
 //Converts a string to lower case
-std::wstring ConvertToLower( std::wstring in );
+std::string ConvertToLower(const std::string& in);
+//Converts a wide string to lower case
+std::wstring ConvertToLower(const std::wstring& in );
 
 //Value type enum.
 enum ValueType
@@ -64,7 +69,7 @@ enum ValueType
 	T_INVALID
 };
 //Function to determine "type" of string argument
-ValueType DetermineType( std::wstring input );
+ValueType DetermineType(const std::wstring& input );
 
 //Helper fn to read a file
 std::wstring ReadFile( const wchar_t* filename );