Changeset 752 for GTP/trunk/Lib/Vis/Preprocessing/src/PlyParser.cpp

Timestamp:

04/20/06 13:25:41 (18 years ago)

Author:

mattausch

Message:

after rendering workshop submissioin
x3dparser can use def - use constructs
implemented improved evaluation (samples are only stored in leaves, only propagate pvs size)

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/PlyParser.cpp (modified) (5 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/PlyParser.cpp

@@ -2 +2 @@
 using namespace std;
 #include <ply.h>
+#include <stdio.h>
 
 #include "PlyParser.h"
@@ -9 +10 @@
 
 
-
-
+// int facesPerMesh = 100000000;
+int facesPerMesh = 30;
+bool useRandomMaterial = false;
+bool indexVertices = true;
 
 /* user's vertex and face definitions for a polygonal object */
@@ -33 +36 @@
 };
 
+
 PlyProperty vert_props[] = { /* list of property information for a vertex */
   {"x", PLY_FLOAT, PLY_FLOAT, offsetof(Vertex,x), 0, 0, 0, 0},
@@ -47 +51 @@
 static PlyFace **flist;
 
+
 bool
-PlyParser::ParseFile(const string filename,
-                                         SceneGraphNode **root,
-                                         const bool loadPolygonsAsMeshes)
+PlyParser::ParseSingleFile(const string filename,
+                                                   SceneGraphNode *root)
 {
-
-  /* user's vertex and face definitions for a polygonal object */
+  /*** the PLY object ***/
+  int nverts;
+  Vertex **vlist;
+  PlyOtherElems *other_elements = NULL;
+  PlyOtherProp *vert_other;
+  int nelems;
+  char **elist;
+  int num_comments;
+  char **comments;
+  int num_obj_info;
+  char **obj_info;
+  int file_type;
   
-
-
-typedef double Matrix[4][4];
-
-/*** the PLY object ***/
-
- int nverts;
- Vertex **vlist;
- PlyOtherElems *other_elements = NULL;
- PlyOtherProp *vert_other;
- int nelems;
- char **elist;
- int num_comments;
- char **comments;
- int num_obj_info;
- char **obj_info;
- int file_type;
- 
- int i,j;
- PlyFile *ply;
- int nprops;
- int num_elems;
- PlyProperty **plist;
- char *elem_name;
- float version;
- 
+  int i,j;
+  PlyFile *ply;
+  int nprops;
+  int num_elems;
+  PlyProperty **plist;
+  char *elem_name;
+  float version;
+  
  
   /*** Read in the original PLY object ***/
@@ -169 +165 @@
  ply_close (ply);
 
-
-
-
- *root = new SceneGraphNode;
- SceneGraphNode *currentNode = *root;
-
-
- cerr<<"Baking faces into eshes"<<endl;
+ SceneGraphNode *currentNode = root;
+
+ cerr<<"Baking faces into meshes"<<endl;
+
  // bake the faces into meshes
- Mesh *mesh = NULL;
- int facesPerMesh = 100;
+ Mesh meshProxy;
+ // only one face per mesh
+ VertexContainer vertices;
+
  for (i = 0; i < nfaces; i++) {
    if (i % facesPerMesh == 0) {
-         if (mesh) {
-                 mesh->Preprocess;
-                 // make an instance of this mesh
-                 MeshInstance *mi = new MeshInstance(mesh);
-                 currentNode->mGeometry.push_back(mi);
-           }
-           mesh = new Mesh();
+         if (meshProxy.mFaces.size()) {
+
+           if (indexVertices)
+                 meshProxy.IndexVertices();
+           
+           Mesh *mesh = new Mesh(meshProxy.mVertices.size(),
+                                                         meshProxy.mFaces.size());
+           
+           
+           //      cout<<"C="<<mesh->mVertices.capacity();
+           mesh->mVertices = meshProxy.mVertices;
+           //      cout<<" NC="<<mesh->mVertices.capacity()<<" S="<<mesh->mVertices.size()<<endl;
+           
+           mesh->mFaces = meshProxy.mFaces;
+           
+           if (useRandomMaterial)
+                 mesh->AssignRandomMaterial();
+
+           mesh->Preprocess();
+           // make an instance of this mesh
+           MeshInstance *mi = new MeshInstance(mesh);
+           currentNode->mGeometry.push_back(mi);
          }
+
+         meshProxy.Clear();
+   }
                  
-         // only one face per mesh
-         VertexIndexContainer vc;
-         
-         // add vertices
-         for (int k  = 0; k < flist[i]->nverts; k++) {
-           Vertex *v = vlist[flist[i]->verts[k]];
-           vc.push_back(mesh->mVertices.size());
-           mesh->mVertices.push_back(Vector3(v->x, v->y, v->z));
-         }
-         
-         mesh->mFaces.push_back(new Face(vc));
+   // only one face per mesh
+   VertexIndexContainer vc;
+   
+   // add vertices
+   for (int k  = 0; k < flist[i]->nverts; k++) {
+         Vertex *v = vlist[flist[i]->verts[k]];
+         vc.push_back(meshProxy.mVertices.size());
+         meshProxy.mVertices.push_back(Vector3(v->x, v->y, v->z));
+   }
+   
+   meshProxy.mFaces.push_back(new Face(vc));
  }
  
+ if (meshProxy.mFaces.size()) {
+
+   if (indexVertices)
+         meshProxy.IndexVertices();
+
+   Mesh *mesh = new Mesh(meshProxy.mVertices.size(),
+                                                 meshProxy.mFaces.size());
+
+   mesh->mVertices = meshProxy.mVertices;
+   
+   mesh->mFaces = meshProxy.mFaces;
+   
+   if (useRandomMaterial)
+         mesh->AssignRandomMaterial();
+   
+   mesh->Preprocess();
+   // make an instance of this mesh
+   MeshInstance *mi = new MeshInstance(mesh);
+   currentNode->mGeometry.push_back(mi);
+ }
+
+ // make sure that no face gets deleted by the destructor!
+ meshProxy.Clear();
+
  for (i=0; i < nverts; i++)
    free(vlist[i]);
+
  free(vlist);
 
  for (i=0; i < nfaces; i++)
    free(flist[i]);
+
  free(flist);
-
+ 
  
  return true;
+
+
 }
+
+bool
+PlyParser::ParseFile(const string filename,
+                                         SceneGraphNode **root,
+                                         const bool loadPolygonsAsMeshes)
+{
+  vector<string> filelist;
+  
+  if (strstr(filename.c_str(), ".plb")) {
+        // parse the filelist
+        FILE *f = fopen(filename.c_str(), "rt");
+        char s[64];
+        if (!f) {
+          cerr<<"Cannot open .plb file"<<endl;
+          exit(1);
+        }
+        while (fgets(s,64,f)) {
+          // remove nl
+          s[strlen(s)-1] = 0;
+          filelist.push_back(s);
+        }
+        fclose(f);
+
+  } else
+        filelist.push_back(filename);
+
+  *root = new SceneGraphNode;
+
+  for (int i=0; i < filelist.size(); i++) {
+        if (!ParseSingleFile(filelist[i], *root)) {
+          cerr<<"Ply parse error. Quiting ...\n";
+          exit(1);
+        }
+  }
+  return true;
+}