Changeset 3247 for GTP/trunk/App/Demos/Vis/FriendlyCulling/Converter/ObjConverter.h

Timestamp:

01/05/09 16:48:21 (15 years ago)

Author:

mattausch

Message:

worked on obj loader
played around with ssao sampling

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/Converter/ObjConverter.h (modified) (5 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/Converter/ObjConverter.h

@@ -5 +5 @@
 #include <string>
 #include <vector>
+#include <map>
 
-/*struct SimpleVec
+
+struct Material
 {
-        SimpleVec() {}
-        SimpleVec(float _x, float _y, float _z): x(_x), y(_y), z(_z) {}
+        float rgb[3];
+        int texture;
+};
 
-        float x, y, z;
-};*/
+class Geometry;
 
 typedef std::vector<SimpleVec> VertexArray;
 typedef std::pair<float, float> Texcoord;
+typedef std::map<std::string, Material *> MaterialTable;
+typedef std::map<std::string, int> TextureTable;
+
+typedef std::vector<std::string> TextureArray;
 
 class ogzstream;
@@ -29 +35 @@
         bool Convert(const std::string &inputFilename, 
                          const std::string &outputFilename);
-        // const std::string textureFilename) const;
+                     // const std::string textureFilename) const;
+
+        bool LoadMaterials(const std::string &matFileName);
 
         ~ObjConverter();
@@ -40 +48 @@
                 SimpleVec *mNormals;
                 Texcoord *mTexcoords;
+                Material *mMaterial;
 
                 int mVertexCount;
@@ -45 +54 @@
         };
 
+typedef std::vector<Geometry *> GeometryArray;
+
         void LoadShape(const VertexArray &faceVertices,
                            const VertexArray &faceNormals,
-                                   const std::vector<Texcoord> &faceTexcoords);
+                                   const std::vector<Texcoord> &faceTexcoords, 
+                                   Material *mat);
 
         void WriteGeometry(ogzstream &str, Geometry *geom);
@@ -55 +67 @@
 
 
-        std::vector<Geometry *> mGeometry;
+        MaterialTable mMaterialTable;
+        TextureTable mTextureTable;
+        
+        TextureArray mTextures;
+        GeometryArray mGeometry;
 
         int mNumShapes;