Changeset 2756 for GTP/trunk/App/Demos/Vis/CHC_revisited/BinaryLoader.cpp

Timestamp:

06/13/08 18:06:32 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/CHC_revisited/BinaryLoader.cpp (modified) (6 diffs)

GTP/trunk/App/Demos/Vis/CHC_revisited/BinaryLoader.cpp

@@ -2 +2 @@
 #include "Matrix4x4.h"
 #include "Geometry.h"
+#include "SceneEntity.h"
 #include "Material.h"
+#include "Texture.h"
 //#include "gzstream.h"
 
@@ -66 +68 @@
 
 
-//SceneEntity *BinaryLoader::LoadShape(igzstream &str)
-SceneEntity *BinaryLoader::LoadShape(ifstream &str)
+//SceneEntity *BinaryLoader::LoadSceneEntity(igzstream &str)
+SceneEntity *BinaryLoader::LoadSceneEntity(ifstream &str)
 {       
         Geometry *geom = LoadGeometry(str);
         Material *mat = LoadMaterial(str);
-
-        Matrix4x4 *m;
-        SceneEntity *sceneGeom = new SceneEntity(geom, m, mat);
+        Matrix4x4 *trafo = NULL;//IdentityMatrix();
+
+        SceneEntity *sceneGeom = new SceneEntity(geom, mat, trafo);
 
         return sceneGeom;
@@ -82 +84 @@
 Material *BinaryLoader::LoadMaterial(ifstream &str)
 {
+        // default material
         Material *mat = new Material();
-/*      
+        
         // texture
         int texnameSize;
@@ -91 +94 @@
         if (texnameSize)
         {
-                TextureAttributes *texAttr;
                 char *texname = new char[texnameSize];
-                str.read(texname, sizeof(char) * texnameSize);
-
-                Texture *tex = get_texture(texname, texAttr);
-                app->setTexture(tex);
-                app->setTextureAttributes(texAttr);
-        }
+                str.read(texname, sizeof(char) *texnameSize);
+
+
+                cout << "loading texture " << texname << " with len " << texnameSize << endl;
+                Texture *tex = new Texture(texname);
+                
+                mat->SetTexture(tex);
+        }
+        else
+                cout << "no texture " << texnameSize << endl;
 
         // material
-        char hasMaterial;
+        /*char hasMaterial;
         str.read(&hasMaterial, sizeof(char));
         
@@ -137 +143 @@
 Geometry *BinaryLoader::LoadGeometry(ifstream &str)
 {
-/*
+        Vector3 *vertices;
+        Vector3 *normals;
+        float *texcoords;
+
+
+        //////////////
+        //-- read in vertices
+
         int vertexCount;
-        int stripCount;
-
-        Point3f *vertices;
-        Vector3f *normals = NULL;
-        Point2f *texCoords = NULL;
-
-        int *stripIndexCounts;
-        int *indices;
-        int *normalIndices;
-
-        // todo
-        int colorCount = 0;
-        int normalCount = 0;
-        int texCount = 0;
-
-        int format;
-
-        // read in format
-        str.read(reinterpret_cast<char *>(&format), sizeof(int));
-        
-        format = IndexedTriangleStripArray::COORDINATES 
-                | IndexedTriangleStripArray::NORMALS
-                ;
-
-        //OUT1("new format: " << format);
-
+        str.read(reinterpret_cast<char *>(&vertexCount), sizeof(int));
+        
         // end of file reached
         if (str.eof())
                 return NULL;
 
-
-        //////////////
-        // read in vertices
-        
-        str.read(reinterpret_cast<char *>(&vertexCount), sizeof(int));
-        
-        vertices = new Point3f[vertexCount];
-    str.read(reinterpret_cast<char *>(vertices), sizeof(Point3f) * vertexCount);
-
-
-        /////////////////
-        // read in strip counters
-        
-        str.read(reinterpret_cast<char *>(&stripCount), sizeof(int));
-
-        stripIndexCounts = new int[stripCount];
-    str.read(reinterpret_cast<char *>(stripIndexCounts), sizeof(int) * stripCount);
-
-
-        //////////
-        // read in indices
-
-        int indexCount;
-        str.read(reinterpret_cast<char *>(&indexCount), sizeof(int));
-        indices = new int[indexCount];
-    str.read(reinterpret_cast<char *>(indices), sizeof(int) * indexCount);
-
-
-        ///////////////
-        // read in normals
-        
-        str.read(reinterpret_cast<char *>(&normalCount), sizeof(int));
-
-        if (normalCount)
-        {
-                normals = new Vector3f[normalCount];
-                str.read(reinterpret_cast<char *>(normals), sizeof(Vector3f) * normalCount);
-                normalIndices = new int[indexCount];
-                str.read(reinterpret_cast<char *>(normalIndices), sizeof(int) * indexCount);
-        }
-
-
-        //////////////
-        // read in texCoords
-        
-        str.read(reinterpret_cast<char *>(&texCount), sizeof(int));
-        if (texCount)
-        {
-                texCoords = new Point2f[texCount];
-                str.read(reinterpret_cast<char *>(texCoords), sizeof(Point2f) * texCount);
-        }
-        
-        IndexedTriangleStripArray *geom = 
-                new IndexedTriangleStripArray(vertexCount, 
-                                                                          normalCount, 
-                                                                          texCount, 
-                                                                          colorCount, 
-                                                                          format, 
-                                                                          indexCount, 
-                                                                          stripIndexCounts, 
-                                                                          stripCount);
-
-        geom->setCoordinates(0, vertices, vertexCount);
-        geom->setCoordinateIndices(0, indices, indexCount);
-
-
-        if (texCount)
-        {
-                geom->setTextureCoordinateIndices(0, indices, indexCount);
-                geom->setTextureCoordinates(0, texCoords, texCount);
-        }
-
-        if (normalCount)
-        {
-                geom->setNormals(0, normals, normalCount);
-                geom->setNormalIndices(0, normalIndices, indexCount);
-        }
-        
-
-        ///////
-        //-- cleanup
-
-        DELAPTR(stripIndexCounts);
-        DELAPTR(vertices);
-        DELAPTR(normals); 
-        DELAPTR(texCoords);
-        DELAPTR(indices);
-        DELAPTR(normalIndices);
-
-        
-        return geom; 
-        */
-return 0;
+        cout << "vertexcount: " << vertexCount << endl;
+
+        vertices = new Vector3[vertexCount];
+    str.read(reinterpret_cast<char *>(vertices), sizeof(Vector3) * vertexCount);
+        
+        normals = new Vector3[vertexCount];
+        str.read(reinterpret_cast<char *>(normals), sizeof(Vector3) * vertexCount);
+
+        int texCoordCount;
+        str.read(reinterpret_cast<char *>(&texCoordCount), sizeof(int));
+
+        if (texCoordCount)
+        {
+                cout << "loading texcoords of size " << texCoordCount << endl;
+                texcoords = new float[texCoordCount * 2];
+                str.read(reinterpret_cast<char *>(texcoords), sizeof(float) * vertexCount * 2);
+        }
+        else
+                texcoords = NULL;
+
+        for (int i = 0; i < vertexCount; i += 3)
+        {
+                Triangle3 tri(vertices[i], vertices[i + 1], vertices[i + 2]);
+                Vector3 n = tri.GetNormal();
+
+                normals[i + 0] = n;
+                normals[i + 1] = n;
+                normals[i + 2] = n;
+        }
+
+        return new Geometry(vertices, normals, texcoords, vertexCount);
 }
 
@@ -267 +194 @@
 bool BinaryLoader::Load(const std::string &filename, SceneEntityContainer &geometry)
 {
-#if 0
-        clear_textures(); // clear the texture table
-
-        BranchGroup *root = new BranchGroup();
-        //root->setName("start");
-        igzstream str(filename.c_str());//, ios::binary);
-        
-        if (!str.is_open())
+        //clear_textures(); // clear the texture table
+
+        //igzstream str(filename.c_str());//, ios::binary);
+        ifstream istr(filename.c_str(), ios::binary);
+        
+        if (!istr.is_open())
                 return false;
 
         // #shapes
         int shapeCount;
-        str.read(reinterpret_cast<char *>(&shapeCount), sizeof(int));
+        istr.read(reinterpret_cast<char *>(&shapeCount), sizeof(int));
 
         int progress = 0;
 
-        GeometryProcessor geomConv(500000, NULL);
-
         for (int i = 0; i < shapeCount; ++ i)
         {
-                Shape3D *shape = LoadShape(str);
-
-                vector<Shape3D *> newShapes;
-                ShapePair shapePair = ShapePair(shape, -1);
-
-                // check, if this node actually contains any geometry
-                CalcNumTrianglesVisitor triangleVisitor;
-                triangleVisitor.Apply(shape);
-                const int numTriangles = triangleVisitor.GetNumTriangles();
-
-                // the shape should be subdivided => replace old shape
-                if (geomConv.SubdivideShape(newShapes, shapePair, numTriangles))
-                {
-                        OUT1("triangleCount: " << numTriangles  << " => subdividing to " << newShapes.size() << " shapes");                     
-                        delete shape;//shape->unref();
-                }
-                else
-                {
-                        newShapes.push_back(shape);
-                }
-
-                VisibilityGroup * visGrp = new VisibilityGroup();
-                root->addChild(visGrp);
-
-                for (size_t j = 0; j < newShapes.size(); ++ j)
-                {
-                        Shape3D *sh = newShapes[j];
-                        visGrp->addChild(sh);
-                }
-
-                int p = i * 100 / shapeCount;
+                SceneEntity *ent = LoadSceneEntity(istr);
+                geometry.push_back(ent);
+                
+                int p = (i + 1) * 100 / shapeCount;
                 
                 if (p >= progress)
                 {
-                        OUT1("% loaded: " << p);
+                        cout << "% loaded: " << p << endl;
                         progress += 10;
                 }
         }
 
-        OUT1("bin loading finished");
-
-        return root;
-#endif
-}
-
-}
+        cout << "bin loading finished" << endl;
+
+        return true;
+}
+
+}