Bug fix conversion without material and improvements

- Added new way to convert dff models by passing only the file path
- Bug fix material assignment without having any txd or material inside

Author: SimoSbara

src/CMakeLists.txt

@@ -37,4 +37,7 @@ install(TARGETS dff_converter
 install(TARGETS dff_converter_static 
         DESTINATION ${DFF_CONVERTER_LIBRARY_OUTPUT_DIRECTORY}
         PUBLIC_HEADER DESTINATION ${DFF_CONVERTER_INCLUDE_OUTPUT_DIRECTORY}
-)
+)
+
+target_include_directories (dff_converter PUBLIC ${DFF_CONVERTER_INCLUDE_OUTPUT_DIRECTORY})
+target_include_directories (dff_converter_static PUBLIC ${DFF_CONVERTER_INCLUDE_OUTPUT_DIRECTORY})

src/converter/Converter.h

@@ -9,6 +9,7 @@
 
 class Converter
 {
+	virtual bool convert(char* output, char* inputDff, char* inputTxd) = 0;
 	virtual bool convert(char* output, rw::Clump &dff, rw::TextureDictionary &txd) = 0;
 	virtual bool convert(char* output, rw::Clump &dff) = 0;
 };

src/converter/ConverterGLTF.cpp

@@ -3,6 +3,7 @@
 #include "util.h"
 #include <lodepng.h>
 
+#include <fstream>
 #include <algorithm>
 #include <climits>
 #include <cfloat>
@@ -429,6 +430,20 @@ int ConverterGLTF::insertIndices(std::vector<BYTE>& buffer, rw::Split* split, in
     return bytesLength;
 }
 
+bool ConverterGLTF::convert(char* output, char* inputDff, char* inputTxd)
+{
+    std::ifstream dff(inputDff, std::ios::binary);
+    std::ifstream txd(inputTxd, std::ios::binary);
+
+    rw::Clump dffStruct;
+    rw::TextureDictionary txdStruct;
+
+    dffStruct.read(dff);
+    txdStruct.read(txd);
+
+    return convert(output, dffStruct, txdStruct);
+}
+
 bool ConverterGLTF::convert(char* output, rw::Clump& dff)
 {
     rw::TextureDictionary emptyTXD;
@@ -464,6 +479,11 @@ bool ConverterGLTF::convert(char* output, rw::Clump& dff, rw::TextureDictionary&
     int splits = geometry->splits.size();
     int curBytesOffset = 0;
 
+    int positionsIndex = -1;
+    int normalsIndex = -1;
+    int texCoordIndex = -1;
+
+
     materials.clear();
 
     //TEXTURES
@@ -499,10 +519,19 @@ bool ConverterGLTF::convert(char* output, rw::Clump& dff, rw::TextureDictionary&
 
     //VERTICI
     curBytesOffset += insertVertices(buffer.data, indeces, geometry, curBytesOffset);
+    positionsIndex = currentAccessor - 1;
     //COORDINATE UV
-    curBytesOffset += insertUVTexture(buffer.data, indeces, geometry, curBytesOffset);
+    if (materials.size() > 0)
+    {
+        curBytesOffset += insertUVTexture(buffer.data, indeces, geometry, curBytesOffset);
+        texCoordIndex = currentAccessor - 1;
+    }
     //NORMALI
     curBytesOffset += insertNormals(buffer.data, indeces, geometry, curBytesOffset);
+    normalsIndex = currentAccessor - 1;
+
+
+
     //OSSA DELLO SCHELETRO
     //curBytesOffset += insertBones(buffer.data, mesh, geometry, curBytesOffset);
 
@@ -522,17 +551,20 @@ bool ConverterGLTF::convert(char* output, rw::Clump& dff, rw::TextureDictionary&
         primitive.indices = currentAccessor - 1;
 
         //VERTICI
-        primitive.attributes["POSITION"] = 0;
+        primitive.attributes["POSITION"] = positionsIndex;
 
         //NORMALI
         if(geometry->hasNormals)
-            primitive.attributes["NORMAL"] = 2;
+            primitive.attributes["NORMAL"] = normalsIndex;
 
         //COORDINATE UV
-        std::string texCoord = "TEXCOORD_0";
-        primitive.attributes[texCoord] = 1;
+        if (texCoordIndex >= 0)
+        {
+            std::string texCoord = "TEXCOORD_0";
+            primitive.attributes[texCoord] = 1;
+            primitive.material = material;
+        }
 
-        primitive.material = material;
         primitive.mode = TINYGLTF_MODE_TRIANGLES;
 
         mesh.primitives.push_back(primitive);

src/converter/ConverterGLTF.h

@@ -39,6 +39,7 @@ class ConverterGLTF : public Converter
 public:
 	ConverterGLTF();
 
+	virtual bool convert(char* output, char* inputDff, char* inputTxd);
 	virtual bool convert(char* output, rw::Clump& dff, rw::TextureDictionary& txd);
 	virtual bool convert(char* output, rw::Clump& dff);
 };

src/main.cpp

@@ -43,22 +43,18 @@ int main()
                 std::ifstream dff(inpDir + baseFile + ".dff", std::ios::binary);
                 std::ifstream txd(inpDir + baseFile + ".txd", std::ios::binary);
 
-                if (dff.is_open() && txd.is_open())
-                {
-                    rw::Clump dffStruct;
-                    rw::TextureDictionary txdStruct;
+                rw::Clump dffStruct;
+                rw::TextureDictionary txdStruct;
 
-                    dffStruct.read(dff);
-                    txdStruct.read(txd);
+                dffStruct.read(dff);
+                txdStruct.read(txd);
 
-                    output = outDir + baseFile + ".gltf";
-
-                    converter.convert((char*)output.c_str(), dffStruct, txdStruct);
+                output = outDir + baseFile + ".gltf";
 
+                if(converter.convert((char*)output.c_str(), dffStruct, txdStruct))
                     std::cout << baseFile << " converted" << std::endl;
-                }
                 else
-                    std::cout << "Cannot open " << baseFile <<  " ignoring..." << std::endl;
+                    std::cout << baseFile << " not converted!" << std::endl;
             }
         }
     }