Changeset 1632 for GTP

Timestamp:

10/17/06 12:06:36 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• BvHierarchy.h (modified) (1 diff)
• HierarchyManager.cpp (modified) (19 diffs)
• RssTree.cpp (modified) (5 diffs)
• SubdivisionCandidate.h (modified) (1 diff)
• ViewCellBsp.cpp (modified) (1 diff)
• ViewCellsManager.cpp (modified) (1 diff)
• VspBspTree.cpp (modified) (10 diffs)
• VspBspTree.h (modified) (1 diff)

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

@@ -408 +408 @@
                 }
 
+                /*bool Apply(SplitQueue *queue, bool terminationCriteriaMet)
+                {
+                        BvhNode *n = sBvHierarchy->Subdivide(splitQueue, this, terminationCriteriaMet);
+                        // local or global termination criteria failed
+                        return !n->IsLeaf();            
+                }*/
+
                 bool GlobalTerminationCriteriaMet() const
                 {

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

@@ -119 +119 @@
         Debug << "min global cost ratio: " << mTermMinGlobalCostRatio << endl;
         Debug << "global cost miss tolerance: " << mTermGlobalCostMissTolerance << endl;
-        Debug << "construction type: " << mConstructionType << endl;
         Debug << "min depth for object space subdivision: " << mMinDepthForObjectSpaceSubdivion << endl;
         Debug << "repair queue: " << mRepairQueue << endl;
         Debug << "number of multilevels: " << mNumMultiLevels << endl;
+
+        switch (mConstructionType)
+        {
+        case 0:
+                Debug << "construction type: sequential" << endl;
+                break;
+        case 1:
+                Debug << "construction type: interleaved" << endl;
+                break;
+        case 2:
+                Debug << "construction type: gradient" << endl;
+                break;
+        case 3:
+                Debug << "construction type: multilevel" << endl;
+                break;
+        default:
+                Debug << "construction type " << mConstructionType << " unknown" << endl;
+                break;
+        }
+
         //Debug << "min render cost " << mMinRenderCostDecrease << endl;
         Debug << endl;
@@ -308 +327 @@
         SplitQueue viewSpaceQueue;
 
-        int maxSteps = 200; // number of initial splits;
+        // number of initial splits
+        int maxSteps = 200;
         float renderCostDecr = 0;
 
@@ -322 +342 @@
                 // for first round, use sah splits. Once view space partition
                 // has started, use render cost heuristics instead
-                SubdivisionCandidate *osc = ResetObjectSpaceSubdivision(sampleRays, objects);
+                SubdivisionCandidate *osc = 
+                        ResetObjectSpaceSubdivision(sampleRays, objects);
                 objectSpaceQueue.Push(osc);
 
-                // process object space candidates using 
-                // render queue for objects until slope of previous subdivision 
-                // is reached
+                // process object space candidates using render queue for 
+                // objects until slope of previous subdivision is reached
                 SubdivisionCandidateContainer ospContainer;
 
-                const int ospSteps = RunConstruction(objectSpaceQueue, ospContainer, renderCostDecr, maxSteps);
+                const int ospSteps = 
+                        RunConstruction(objectSpaceQueue, ospContainer, renderCostDecr, maxSteps);
             cout << ospSteps << " object space partition steps taken" << endl;
 
@@ -345 +366 @@
 
                 CollectDirtyCandidates(ospContainer, dirtyList);
-                RepairQueue(dirtyList, viewSpaceQueue);
+                //RepairQueue(dirtyList, viewSpaceQueue);
 
                 cout << "finished repairing queue ... " << endl;
@@ -354 +375 @@
                 // subdivide view space with respect to the objects
 
-                SubdivisionCandidate *vsc = ResetViewSpaceSubdivision(sampleRays, objects);
+                SubdivisionCandidate *vsc = 
+                        ResetViewSpaceSubdivision(sampleRays, objects);
                 viewSpaceQueue.Push(vsc);
 
                 SubdivisionCandidateContainer vspContainer;
                 // process view space candidates
-                const int vspSteps = RunConstruction(viewSpaceQueue, vspContainer, renderCostDecr, maxSteps);
-
-                cout << vspSteps << " object space partition steps taken" << endl;
+                const int vspSteps = 
+                        RunConstruction(viewSpaceQueue, vspContainer, renderCostDecr, maxSteps);
+
+                cout << vspSteps << " view space partition steps taken" << endl;
 
                 // view space subdivision constructed
@@ -373 +396 @@
                 
                 CollectDirtyCandidates(vspContainer, dirtyList);
-                RepairQueue(dirtyList, objectSpaceQueue);
+                //RepairQueue(dirtyList, objectSpaceQueue);
 
                 cout << "finished repairing queue ... " << endl;
@@ -417 +440 @@
         mViewSpaceSubdivisionType = NO_VIEWSPACE_SUBDIV;
 
-        // start with view space subdivison immediately?
+        // start view space subdivison immediately?
         if (StartViewSpaceSubdivision())
         {
                 // prepare vsp tree for traversal
                 mViewSpaceSubdivisionType = mSavedViewSpaceSubdivisionType;
-                PrepareViewSpaceSubdivision(sampleRays, objects);
+                SubdivisionCandidate *vspSc = 
+                        PrepareViewSpaceSubdivision(sampleRays, objects);
+                mTQueue.Push(vspSc);
         }
         
@@ -429 +454 @@
         {
                 mObjectSpaceSubdivisionType = mSavedObjectSpaceSubdivisionType;
-                PrepareObjectSpaceSubdivision(sampleRays, objects);
-        }
-cout << "****************555555555555555555555555" << endl;
+                SubdivisionCandidate *ospSc =
+                        PrepareObjectSpaceSubdivision(sampleRays, objects);
+                mTQueue.Push(ospSc);
+        }
+
         // begin subdivision
         RunConstruction(mRepairQueue, sampleRays, objects, forcedViewSpace);
@@ -449 +476 @@
                                                                                                                                         const ObjectContainer &objects)
 {
-        cout << "\nstarting view space hierarchy construction ... " << endl;
+        cout << "\npreparing view space hierarchy construction ... " << endl;
 
         // hack: reset global cost misses
@@ -541 +568 @@
                 {
                         VspNode *n = mVspTree->Subdivide(splitQueue, sc, terminationCriteriaMet);
-                        // check if termination criteria failed
+
+                        // check if terminated
                         success = !n->IsLeaf();
                 }
@@ -564 +592 @@
                 break;
         default:
+                cerr << "unknown subdivision type" << endl;
                 break;
         }
@@ -682 +711 @@
         {
                 SubdivisionCandidate *sc = NextSubdivisionCandidate(mTQueue);    
-                        
+        
                 ///////////////////
                 //-- subdivide leaf node
@@ -698 +727 @@
                                  << mMinDepthForObjectSpaceSubdivion << ") " << endl;
 
-                        PrepareObjectSpaceSubdivision(sampleRays, objects);
+                        SubdivisionCandidate *ospSc = PrepareObjectSpaceSubdivision(sampleRays, objects);
+                        mTQueue.Push(ospSc);
 
                         cout << "reseting queue ... ";
@@ -713 +743 @@
                                  << mMinDepthForViewSpaceSubdivion << ") " << endl;
 
-                        PrepareViewSpaceSubdivision(sampleRays, objects);
+                        SubdivisionCandidate *vspSc = PrepareViewSpaceSubdivision(sampleRays, objects);
+                        mTQueue.Push(vspSc);
 
                         cout << "reseting queue ... ";
@@ -763 +794 @@
 
                 const bool repairQueue = false;
-                ApplySubdivisionCandidate(sc, splitQueue, repairQueue);
-
-                chosenCandidates.push_back(sc);
+                bool success = ApplySubdivisionCandidate(sc, splitQueue, repairQueue);
+
+                if (success)
+                {
+                        chosenCandidates.push_back(sc);
+                }
         }
 
@@ -781 +815 @@
         }
 
-        SubdivisionCandidate *firstCandidate = NULL;
+        SubdivisionCandidate *firstCandidate;
 
         // object space partition constructed => reconstruct
@@ -791 +825 @@
                         Debug << "old bv hierarchy:\n " << mBvHierarchy->mBvhStats << endl;
         
-                        SubdivisionCandidate *firstCandidate = 
-                                mBvHierarchy->Reset(sampleRays, objects);
-
+                        firstCandidate = mBvHierarchy->Reset(sampleRays, objects);
+                        cout << "here4" << endl;
                         mHierarchyStats.mTotalCost = mBvHierarchy->mTotalCost;
 
@@ -802 +835 @@
                         // evaluate stats before first subdivision
                         EvalSubdivisionStats();
+                        cout << "here5" << endl;
                 }
                 break;
@@ -807 +841 @@
         case KD_BASED_OBJ_SUBDIV:
                 // TODO
-                break;
         default:
-                break;
-        }
-
+                firstCandidate = NULL;
+                break;
+        }
+cout << "here6" << endl;
         return firstCandidate;
 }

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

@@ -2178 +2178 @@
   
   
-  int nrays = leaf->rays.size();
-  int startIndex = rays.size();
+  int nrays = (int)leaf->rays.size();
+  int startIndex = (int)rays.size();
   
   AxisAlignedBox3 box = GetBBox(leaf);
@@ -2451 +2451 @@
         if (leaf->rays[i].mRay->RefCount() != 0) {
           cerr<<"Error: refcount!=0, but"<<leaf->rays[i].mRay->RefCount()<<endl;
-          cerr<<"desired="<<desired<<"i="<<i<<" size="<<leaf->rays.size()<<endl;
+          cerr<<"desired="<<desired<<"i="<<i<<" size="<<(int)leaf->rays.size()<<endl;
           exit(1);
         }
@@ -2577 +2577 @@
   int fixedPerLeaf = 0;
   // int fixedPerLeaf = 0;
-  int fixed = fixedPerLeaf*leaves.size();
+  int fixed = fixedPerLeaf*(int)leaves.size();
   int iGenerated = numberOfRays;
   float ratioPerLeaf = iGenerated /(avgContrib*numberOfLeaves);
@@ -2592 +2592 @@
         }
 
-  return rays.size();
+  return (int)rays.size();
 }
 
@@ -2933 +2933 @@
         int id = object->GetId()-1;
         if (id < 0 || id >= mRoots.size()) {
-          Debug<<"Error: object Id out of range, Id="<<id<<" roots.size()="<<mRoots.size()<<
+          Debug<<"Error: object Id out of range, Id="<<id<<" roots.size()="<<(int)mRoots.size()<<
                 endl<<flush;
           id = (int)mRoots.size()-1; // $$ last tree is used by all unsigned objects

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

@@ -22 +22 @@
         virtual void EvalPriority() = 0;
         virtual int Type() const = 0;
+        //virtual bool Apply() = 0;
         virtual bool GlobalTerminationCriteriaMet() const = 0;
 

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

@@ -724 +724 @@
 
         // extract planes of box
-        // TODO: can be done more elegantly than first extracting polygons
-        // and take their planes
+        // TODO: can be done more elegantly than here 
+        // where we first extract polygons, then compute their planes
         for (pit = boxPolys.begin(); pit != pit_end; ++ pit)
         {

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

@@ -38 +38 @@
 // HACK
 const static bool SAMPLE_AFTER_SUBDIVISION = true;
-const static bool CLAMP_TO_BOX = true;
+const static bool CLAMP_TO_BOX = false;
 
 template <typename T> class myless

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

@@ -241 +241 @@
 
 int VspBspTree::AddMeshToPolygons(Mesh *mesh,
-                                                                  PolygonContainer &polys,
-                                                                  MeshInstance *parent)
-{
-        if (!mesh)
-                return 0;
+                                                                  PolygonContainer &polys) const
+{
+        if (!mesh) return 0;
 
         FaceContainer::const_iterator fi;
@@ -256 +254 @@
                 if (poly->Valid(mEpsilon))
                 {
-                        poly->mParent = parent; // set parent intersectable
                         polys.push_back(poly);
                 }
@@ -269 +266 @@
 
 
-int VspBspTree::AddToPolygonSoup(const ViewCellContainer &viewCells,
-                                                                 PolygonContainer &polys,
-                                                                 int maxObjects)
-{
-        const int limit = (maxObjects > 0) ?
-                Min((int)viewCells.size(), maxObjects) : (int)viewCells.size();
-
-        int polysSize = 0;
-        
-        for (int i = 0; i < limit; ++ i)
-        {
-                Mesh *mesh = viewCells[i]->GetMesh();
-                if (mesh) 
-                {       // copy the mesh into polygons and add to BSP tree aabb
-                        mBoundingBox.Include(viewCells[i]->GetBox()); 
-                        polysSize += AddMeshToPolygons(mesh,
-                                                                                   polys,
-                                                                                   viewCells[i]);
-                }
-        }
-        
-        return polysSize;
+void VspBspTree::ExtractPolygons(Intersectable *object, PolygonContainer &polys) const
+{
+        // extract the polygons from the intersectables
+        switch (object->Type())
+        {
+                case Intersectable::MESH_INSTANCE:
+                        {
+                                Mesh *mesh = dynamic_cast<MeshInstance *>(object)->GetMesh();
+                                AddMeshToPolygons(mesh, polys);
+                        }
+                        break;
+                case Intersectable::VIEW_CELL:
+                        {
+                                Mesh *mesh = dynamic_cast<ViewCell *>(object)->GetMesh();
+                                AddMeshToPolygons(mesh, polys);
+                                break;
+                        }
+                case Intersectable::TRANSFORMED_MESH_INSTANCE:
+                        {
+                                TransformedMeshInstance *mi = 
+                                        dynamic_cast<TransformedMeshInstance *>(object);
+
+                                Mesh mesh;
+                                mi->GetTransformedMesh(mesh);
+                                AddMeshToPolygons(&mesh, polys);
+                        }
+                        break;
+                case Intersectable::TRIANGLE_INTERSECTABLE:
+                        {
+                                TriangleIntersectable *intersect = 
+                                        dynamic_cast<TriangleIntersectable *>(object);
+
+                                Polygon3 *poly = new Polygon3(intersect->GetItem());
+
+                                if (poly->Valid(mEpsilon))      
+                                {
+                                        polys.push_back(poly);
+                                }
+                                else
+                                {
+                                        delete poly;
+                                }
+                        }
+                        break;
+                default:
+                        Debug << "intersectable type not supported" << endl;
+                        break;
+        }
 }
 
@@ -304 +327 @@
         {
                 Intersectable *object = objects[i];//*it;
-                Mesh *mesh = NULL;
-
-                switch (object->Type()) // extract the meshes
-                {
-                case Intersectable::MESH_INSTANCE:
-                        mesh = dynamic_cast<MeshInstance *>(object)->GetMesh();
-                        AddMeshToPolygons(mesh, polys, NULL);
-                        break;
-                case Intersectable::VIEW_CELL:
-                        mesh = dynamic_cast<ViewCell *>(object)->GetMesh();
-                        AddMeshToPolygons(mesh, polys, NULL);
-                        break;
-                case Intersectable::TRANSFORMED_MESH_INSTANCE:
-                        {
-                                TransformedMeshInstance *mi = 
-                                        dynamic_cast<TransformedMeshInstance *>(object);
-
-                                Mesh mesh;
-                                mi->GetTransformedMesh(mesh);
-                                AddMeshToPolygons(&mesh, polys, NULL);
-                break;
-                        }
-                case Intersectable::TRIANGLE_INTERSECTABLE:
-                        {
-                                TriangleIntersectable *intersect = 
-                                        dynamic_cast<TriangleIntersectable *>(object);
-
-                                Polygon3 *poly = new Polygon3(intersect->GetItem());
-
-                                if (poly->Valid(mEpsilon))      
-                                        polys.push_back(poly);
-                                else
-                                        delete poly;
-                        }
-                default:
-                                Debug << "intersectable type not supported" << endl;
-                        break;
-                }
+                ExtractPolygons(object, polys);
 
                 mBoundingBox.Include(object->GetBox()); // add to BSP tree aabb
@@ -404 +390 @@
                         Intersectable *obj = ray->mTerminationObject;
 
-                        if ((mBoundingBox.IsInside(ray->mTermination) || !forcedBoundingBox) &&
-                                obj && !obj->Mailed())
-                        {
-                                obj->Mail();
-
-                                // handle intersectable
-                                switch (obj->Type())
-                                {
-                                        case Intersectable::TRANSFORMED_MESH_INSTANCE:
-                                                {
-                                                        Mesh mesh;
-                                
-                                                        TransformedMeshInstance *tmobj = 
-                                                                dynamic_cast<TransformedMeshInstance *>(obj);
-                                
-                                                        tmobj->GetTransformedMesh(mesh);
-                                                        AddMeshToPolygons(&mesh, polys, tmobj);
-                                                }
-                                                break;
-
-                                        case Intersectable::MESH_INSTANCE:
-                                                {
-                                                        MeshInstance *mobj = dynamic_cast<MeshInstance *>(obj);
-                                                        AddMeshToPolygons(mobj->GetMesh(), polys, mobj);
-                                                }
-                                                break;
-
-                                        case Intersectable::TRIANGLE_INTERSECTABLE:
-                                                {
-                                                        TriangleIntersectable *intersect = 
-                                                                        dynamic_cast<TriangleIntersectable *>(obj);
-
-                                                        Polygon3 *poly = new Polygon3(intersect->GetItem());
-
-                                                        if (poly->Valid(mEpsilon))      
-                                                                polys.push_back(poly);
-                                                        else
-                                                                delete poly;
-                                                }
-                                                break;
-
-                                        default:
-                                                cout << "not implemented yet" << endl;
-                                                break;
-                                }
-
-                                ++ numObj;
-
-                                /////////
-                                //-- compute bounding box
-
-                                if (!forcedBoundingBox)
-                                {
-                                        mBoundingBox.Include(ray->mTermination);
-                                }
+                        ++ numObj;
+
+                        /////////
+                        //-- compute bounding box
+
+                        if (!forcedBoundingBox)
+                        {
+                                mBoundingBox.Include(ray->mTermination);
                         }
 
@@ -466 +405 @@
                         {               
                                 ray->mOriginObject->Mail();
-                                MeshInstance *obj = dynamic_cast<MeshInstance *>(ray->mOriginObject);
-                                AddMeshToPolygons(obj->GetMesh(), polys, obj);
-                                
+                                ExtractPolygons(ray->mOriginObject, polys);
+                                                                
                                 ++ numObj;
                         }
@@ -475 +413 @@
                 // throw out unnecessary polygons
                 PreprocessPolygons(polys);
-
                 cout << "finished" << endl;
 
@@ -1021 +958 @@
         //////////////////
         //-- terminate traversal and create new view cell
+
         if (newNode->IsLeaf())
         {
@@ -1035 +973 @@
                 // update scalar pvs size value
                 ObjectPvs &pvs = viewCell->GetPvs();
-                mViewCellsManager->UpdateScalarPvsSize(viewCell, pvs.CountObjectsInPvs(), pvs.GetSize());
+                mViewCellsManager->UpdateScalarPvsSize(viewCell, 
+                                                                                           pvs.CountObjectsInPvs(), 
+                                                                                           pvs.GetSize());
 
                 mBspStats.contributingSamples += conSamp;
-                mBspStats.sampleContributions +=(int) sampCon;
+                mBspStats.sampleContributions += (int)sampCon;
 
                 viewCell->mLeaves.push_back(leaf);
@@ -1044 +984 @@
                 ///////////
                 //-- store additional info
+
                 if (mStoreRays)
                 {

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

@@ -538 +538 @@
                                                  int maxObjects = 0);
 
-        /** Extracts the meshes of the view cells and and adds them to polygons.
-                Adds view cell aabb to the aabb of the tree.
-                @param maxPolys the maximal number of objects to be stored as polygons
-                @returns the number of polygons
-        */
-        int AddToPolygonSoup(const ViewCellContainer &viewCells, 
-                                                 PolygonContainer &polys, 
-                                                 int maxObjects = 0);
-
-        /** Extract polygons of this mesh and add to polygon container.
+        void ExtractPolygons(Intersectable *obj, PolygonContainer &polys) const;
+
+        /** Extract polygons of this mesh and adds them to container.
                 @param mesh the mesh that drives the polygon construction
-                @param parent the parent intersectable this polygon is constructed from
                 @returns number of polygons
         */
-        int AddMeshToPolygons(Mesh *mesh, PolygonContainer &polys, MeshInstance *parent);
+        int AddMeshToPolygons(Mesh *mesh, PolygonContainer &polys) const;
 
         /** Selects an axis aligned for the next split.