added support for AC3D

Author: programmerjake

generate.h

@@ -138,6 +138,23 @@ namespace Generate
         return Mesh(std::move(triangles), texture);
 	}
 
+	inline Mesh convexPolygon(shared_ptr<Texture> texture, vector<tuple<VectorF, TextureCoord>> vertices)
+	{
+	    if(vertices.size() < 3)
+            return Mesh();
+        vector<Triangle> triangles;
+        triangles.reserve(vertices.size() - 2);
+        tuple<VectorF, TextureCoord> v1 = vertices[0];
+        for(size_t i = 1, j = 2; j < vertices.size(); i++, j++)
+        {
+            tuple<VectorF, TextureCoord> v2 = vertices[i], v3 = vertices[j];
+            triangles.push_back(Triangle(get<0>(v1), get<1>(v1),
+                                          get<0>(v2), get<1>(v2),
+                                          get<0>(v3), get<1>(v3)));
+        }
+        return Mesh(std::move(triangles), texture);
+	}
+
 	/// make a box from <0, 0, 0> to <1, 1, 1>
 	inline Mesh unitBox(TextureDescriptor nx, TextureDescriptor px, TextureDescriptor ny, TextureDescriptor py, TextureDescriptor nz, TextureDescriptor pz)
 	{

lib3d.cbp

@@ -11,6 +11,7 @@
 				<Option object_output="obj/Debug/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
+				<Option parameters="test_objects/f16/f16.ac" />
 				<Compiler>
 					<Add option="-g" />
 					<Add option="`sdl2-config --cflags` `pkg-config libavcodec libavformat libavutil libswscale MagickWand --cflags`" />

main.cpp

@@ -96,7 +96,7 @@ int main(int argc, char **argv)
         string fileName = argc > 1 ? argv[1] : "";
         if(fileName != "")
         {
-            shared_ptr<ModelLoader> loader = ModelLoader::loadOBJ(fileName, [](string msg){cout << "model load : warning : " << msg << endl;});
+            shared_ptr<ModelLoader> loader = ModelLoader::load(fileName, [](string msg){cout << "model load : warning : " << msg << endl;});
             model = loader->loadAll();
             cout << "model has " << model->triangleCount() << " triangles." << endl;
         }

material.h

@@ -4,6 +4,7 @@
 #include "image.h"
 #include "vector.h"
 #include <vector>
+#include <functional> // std::hash
 
 using namespace std;
 
@@ -88,6 +89,33 @@ struct Material
         return !operator ==(rt);
     }
 };
+
+namespace std
+{
+template <>
+struct hash<Material>
+{
+private:
+    hash<float> hash_float;
+    hash<shared_ptr<Texture>> hash_texture;
+public:
+    size_t operator ()(const Material &m) const
+    {
+        size_t retval = hash_float(m.ambient.r);
+        retval += hash_float(m.ambient.g);
+        retval += hash_float(m.ambient.b);
+        retval += hash_float(m.ambient.a);
+        retval += hash_float(m.diffuse.r);
+        retval += hash_float(m.diffuse.g);
+        retval += hash_float(m.diffuse.b);
+        retval += hash_float(m.diffuse.a);
+        retval += hash_float(m.opacity);
+        retval += hash_texture(m.texture);
+        return retval;
+    }
+};
+}
+
 #if 0
 template <>
 struct LightListLiteral<>