Changeset 2183 for GTP/trunk/Lib/Vis/Preprocessing/src

Timestamp:

03/02/07 13:13:24 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Polygon3.cpp (modified) (1 diff)
• Preprocessor.cpp (modified) (11 diffs)
• Preprocessor.h (modified) (1 diff)

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

@@ -283 +283 @@
                 if (GetArea() < AREA_LIMIT)
                 {
-                        Debug << "area too small: " << GetArea() << endl;
+                        Debug << "area too small: " << GetArea() << std::endl;
                         return false;
                 }

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

@@ -22 +22 @@
 #include "InternalRayCaster.h"
 #include "GlobalLinesRenderer.h"
+#include "ObjectsParser.h"
 
 
@@ -27 +28 @@
 #define SHOW_RAYCAST_TIMING 1
 
+using namespace std;
 
 namespace GtpVisibilityPreprocessor {
@@ -265 +267 @@
 
 
-bool Preprocessor::LoadBinaryObj(const string filename,
+bool Preprocessor::LoadBinaryObj(const string &filename,
                                                                  SceneGraphNode *root,
                                                                  vector<FaceParentInfo> *parents)
@@ -277 +279 @@
         cout << "binary obj dump available, loading " << filename.c_str() << endl;
         
-        // table for vertices
-        VertexContainer vertices; 
-        
-        if (parents)
-                cout << "using face parents" << endl;
-        else
-                cout << "not using face parents" << endl;
-
         // read in triangle size
         int numTriangles;
@@ -309 +303 @@
                 root->mGeometry.push_back(obj);
                 
-                i ++;
-        
-                if (i % 500000 == 499999)
+                if ((i ++) % 500000 == 499999)
                          cout<<"\r"<<i<<"/"<<numTriangles<<"\r";
         }
@@ -488 +480 @@
         const int files = SplitFilenames(filename, filenames);
         cout << "number of input files: " << files << endl;
+
         bool result = false;
         bool isObj = false;
@@ -547 +540 @@
                                                 
                                 cout << "loaded " << (int)mSceneGraph->GetRoot()->mGeometry.size() << " entities" << endl;
+
                                 // only works for triangles
                                 if (result && !mLoadMeshes)
                                 {
                                         cout << "exporting binary obj to " << bnFile << "... " << endl;
+
                                         ExportBinaryObj(bnFile, mSceneGraph->GetRoot());
+                                
                                         cout << "finished" << endl;
                                 }
 
                                 delete parser;
-                        }
-                        else if (0)
-                        {
-                                ExportBinaryObj("../data/test.bn", mSceneGraph->GetRoot());
                         }
                 }
@@ -740 +732 @@
         if (mLoadViewCells)
         {       
+                
+#ifdef USE_BIT_PVS
+                // HACK: for kd pvs, set pvs size to maximal number of kd nodes
+                vector<KdLeaf *> leaves;
+                preprocessor->mKdTree->CollectLeaves(leaves);
+
+                ObjectPvs::SetPvsSize((int)leaves.size());
+#endif
+
                 Environment::GetSingleton()->GetStringValue("ViewCells.filename", buf);
-                cout << "loading view cells from " << buf << endl<<flush;
-
-                mViewCellsManager = ViewCellsManager::LoadViewCells(buf, &mObjects, true, NULL);
+                cout << "loading objects from " << buf << endl;
+
+                // load objects which will be used as pvs entries
+                ObjectContainer pvsObjects;
+                if (0) LoadObjects(buf, pvsObjects, mObjects);
+
+                const bool finalizeViewCells = true;
+                cout << "loading view cells from " << buf << endl;
+
+                mViewCellsManager = ViewCellsManager::LoadViewCells(buf, 
+                                                                                                                        pvsObjects,
+                                                                                                                        mObjects, 
+                                                                                                                        finalizeViewCells, 
+                                                                                                                        NULL);
 
                 cout << "view cells loaded." << endl<<flush;
@@ -1262 +1274 @@
         const long t1 = GetTime();
         
-        if (0 && (int)rays.size() > 10000) {
+        if ((int)rays.size() > 10000) {
         
                 mRayCaster->SortRays(rays);
@@ -1356 +1368 @@
         
                 if ((int)rays.size() > 100000 && i % 100000 == 0)
-                        //cout << "here2 " << vssRays.size()<<endl;
                         cout<<"\r"<<i<<"/"<<(int)rays.size()<<"\r";
         }
@@ -1632 +1643 @@
 
 
-}
+bool Preprocessor::LoadObjects(const string &filename,
+                                                           ObjectContainer &pvsObjects, 
+                                                           const ObjectContainer &preprocessorObjects)
+{
+        ObjectsParser parser;
+
+        const bool success = parser.ParseObjects(filename, 
+                                                                                         pvsObjects, 
+                                                                                         preprocessorObjects);
+
+        if (!success)
+        {
+                Debug << "Error: loading objects failed!" << endl;
+        }
+
+        // hack: no bvh object could be found => take preprocessor objects
+        if (pvsObjects.empty())
+        {
+                Debug << "no objects" << endl;
+                pvsObjects = preprocessorObjects;
+        }
+
+        return success;
+}
+
+
+}

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

@@ -263 +263 @@
 protected:
 
-        bool LoadBinaryObj(const string &filename,
+        bool LoadBinaryObj(const std::string &filename,
                                            SceneGraphNode *root,
-                                           vector<FaceParentInfo> *parents);
-
-        bool ExportBinaryObj(const string filename, SceneGraphNode *root);
+                                           std::vector<FaceParentInfo> *parents);
+
+        bool ExportBinaryObj(const std::string filename, SceneGraphNode *root);
 
         void SetupRay(Ray &ray, const Vector3 &point, const Vector3 &direction) const;