Changeset 750

Timestamp:

04/12/06 08:18:49 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Mesh.cpp (modified) (2 diffs)
• Mesh.h (modified) (1 diff)
• Polygon3.h (modified) (1 diff)
• Preprocessor.cpp (modified) (4 diffs)
• UnigraphicsParser.cpp (modified) (1 diff)
• ViewCellsManager.cpp (modified) (1 diff)
• VssPreprocessor.cpp (modified) (1 diff)

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

@@ -49 +49 @@
   return box;
 }
+
 
 int
@@ -461 +462 @@
   AddFace(new Face(index + 0, index + 1, index + 2, index + 3) );
 }
+
+
+
+Mesh *CreateBox(const AxisAlignedBox3 &box)
+{
+        Mesh *mesh = new Mesh;
+  // add 8 vertices of the box
+  int index = (int)mesh->mVertices.size();
+  for (int i=0; i < 8; i++) {
+    Vector3 v;
+    box.GetVertex(i, v);
+    mesh->mVertices.push_back(v);
+  }
+  
+  mesh->AddFace(new Face(index + 0, index + 1, index + 3, index + 2) );
+  mesh->AddFace(new Face(index + 0, index + 2, index + 6, index + 4) );
+  mesh->AddFace(new Face(index + 4, index + 6, index + 7, index + 5) );
+  
+  mesh->AddFace(new Face(index + 3, index + 1, index + 5, index + 7) );
+  mesh->AddFace(new Face(index + 0, index + 4, index + 5, index + 1) );
+  mesh->AddFace(new Face(index + 2, index + 3, index + 7, index + 6) );
+  
+  return mesh;
+}

GTP/trunk/Lib/Vis/Preprocessing/src/Mesh.h

@@ -155 +155 @@
         return s<<"Mesh #vertices="<<(int)mVertices.size()<<" #faces="<<(int)mFaces.size();
   }
-  
-
+
+  friend Mesh *CreateBox(const AxisAlignedBox3 &box);
 };
 

GTP/trunk/Lib/Vis/Preprocessing/src/Polygon3.h

@@ -102 +102 @@
         void Triangulate(vector<Triangle3> &triangles);
         /**
-                Adds polygon to mesh
+                Adds polygon to mesh description as a face
         */
         void AddToMesh(Mesh &mesh);

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

@@ -15 +15 @@
 
 Preprocessor *preprocessor;
+
+
+static void AddGeometry(SceneGraph *scene)
+{
+        AxisAlignedBox3 sceneBox = scene->GetBox();
+
+        int n = 200;
+
+        if (0){
+        // form figure
+        for (int i = 0; i < n; ++ i)
+        {
+                for (int j = 0; j < n; ++ j)
+                {
+                        const Vector3 scale2((float)j * 0.8 / n + 0.1,  0.05, (float)i * 0.8  / (float)n + 0.1);
+                
+                        Vector3 pt2 = sceneBox.Min() + scale2 * (sceneBox.Max() - sceneBox.Min());
+                
+                        Vector3 boxSize = sceneBox.Size() * Vector3(0.0025, 0.01, 0.0025);
+                        AxisAlignedBox3 box(pt2, pt2 + boxSize);
+                        Mesh *mesh = CreateBox(box);
+
+                        mesh->Preprocess();
+                
+                        MeshInstance *mi = new MeshInstance(mesh);
+                        scene->mRoot->mGeometry.push_back(mi);
+                }
+        }
+
+        for (int i = 0; i < n; ++ i)
+        {
+                for (int j = 0; j < n; ++ j)
+                {
+                        const Vector3 scale2(0.15, (float)j * 0.8 / n + 0.1, (float)i * 0.8  / (float)n + 0.1);
+                
+                        Vector3 pt2 = sceneBox.Min() + scale2 * (sceneBox.Max() - sceneBox.Min());
+                
+                        Vector3 boxSize = sceneBox.Size() * Vector3(0.0025, 0.01, 0.0025);
+                        AxisAlignedBox3 box(pt2, pt2 + boxSize);
+                        Mesh *mesh = CreateBox(box);
+
+                        mesh->Preprocess();
+                
+                        MeshInstance *mi = new MeshInstance(mesh);
+                        scene->mRoot->mGeometry.push_back(mi);
+                }
+        }
+
+        for (int i = 0; i < n; ++ i)
+        {
+                const Vector3 scale2(2, 0.2, (float)i * 0.8  / (float)n + 0.1);
+                
+                Vector3 pt2 = sceneBox.Min() + scale2 * (sceneBox.Max() - sceneBox.Min());
+                
+                //Vector3 boxSize = sceneBox.Size() * Vector3(0.0025, 0.01, 0.0025);
+                Vector3 boxSize = sceneBox.Size() * Vector3(0.005, 0.02, 0.005);
+                AxisAlignedBox3 box(pt2 + 0.1, pt2 + boxSize);
+                Mesh *mesh = CreateBox(box);
+
+                mesh->Preprocess();
+                
+                MeshInstance *mi = new MeshInstance(mesh);
+                scene->mRoot->mGeometry.push_back(mi);
+        }
+        
+        scene->mRoot->UpdateBox();
+        }
+// plane separating areas
+if(1)
+{
+const Vector3 scale(1.0, 0.0, 0);
+
+    Vector3 pt = sceneBox.Min() + scale * (sceneBox.Max() - sceneBox.Min());
+
+        Plane3 cuttingPlane(Vector3(1, 0, 0), pt);
+        
+        Mesh *planeMesh = new Mesh();
+        
+        Polygon3 *poly = sceneBox.CrossSection(cuttingPlane);
+
+        poly->AddToMesh(*planeMesh);
+
+        planeMesh->Preprocess();
+
+    MeshInstance *planeMi = new MeshInstance(planeMesh);
+    scene->mRoot->mGeometry.push_back(planeMi);
+}       
+}
+
 
 Preprocessor::Preprocessor():
@@ -76 +165 @@
         return (int)filenames.size();
 }
+
 
 bool
@@ -124 +214 @@
 
         if (result) {
-          
+          // HACK 
+        mSceneGraph->mRoot->UpdateBox();
+        AddGeometry(mSceneGraph);
           mSceneGraph->AssignObjectIds();
           int intersectables, faces;
@@ -132 +224 @@
           cout<<"#NUM_FACES (Total numner of faces)\n"<<faces<<endl;
           mSceneGraph->CollectObjects(&mObjects);
-          mSceneGraph->mRoot->UpdateBox();
+          //mSceneGraph->mRoot->UpdateBox();
 
          /* Exporter *exporter = Exporter::GetExporter("testload.x3d");

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

@@ -184 +184 @@
   fclose(file);
   
+  
   *proot = root;
 

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

@@ -372 +372 @@
                         }
 
-                        //exporter->SetWireframe();
+                        exporter->SetWireframe();
                         ExportViewCellsForViz(exporter);
 

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

@@ -572 +572 @@
           else
           {
-                // HACK: enlarge in y directon
-                mViewSpaceBox = new AxisAlignedBox3(mKdTree->GetBox());
-
-                if (0) {
-                //Vector3 pmin = mViewSpaceBox->Min();
-                Vector3 size = mViewSpaceBox->Size();
-                //size[1] *= 1.25;
-                Vector3 enlarge(size[0] * 0.25f, size[1] * 0.0f, size[2] * 0.25f);
-
-                mViewSpaceBox->Enlarge(enlarge);
-                } else {
-                  // $$ JB temporary
-                  AxisAlignedBox3 box = *mViewSpaceBox;
-                  float s = box.Size(0);
-                  box.Scale(0.8f);
-                  box.SetMax(0, box.Max(0) + s*0.8f);
-                  box.SetMin(0, box.Min(0) + s*0.8f);
-                  *mViewSpaceBox = box;
-                }
-                
+                  // HACK: enlarge in y directon
+                  mViewSpaceBox = new AxisAlignedBox3(mKdTree->GetBox());
+
+                  if (1) 
+                  {
+                          //Vector3 pmin = mViewSpaceBox->Min();
+                          Vector3 size = mViewSpaceBox->Size();
+                          //size[1] *= 1.25;
+                          //Vector3 enlarge(size[0] * 0.25f, size[1] * 0.0f, size[2] * 0.25f);
+                          Vector3 enlarge(size[0] * 4.0f, 0.0f, 0.0f);
+
+                          //mViewSpaceBox->Enlarge(enlarge);
+                          mViewSpaceBox->SetMax(mViewSpaceBox->Max() + enlarge);
+                  } 
+                  else 
+                  {
+                          // $$ JB temporary
+                          AxisAlignedBox3 box = *mViewSpaceBox;
+                          
+                          float s = box.Size(0);
+                          
+                          box.Scale(0.8f);
+                          box.SetMax(0, box.Max(0) + s*0.8f);
+                          box.SetMin(0, box.Min(0) + s*0.8f);
+                          *mViewSpaceBox = box;
+                  }             
           }
           //Debug << "view space box: " << *mViewSpaceBox << endl;