Changeset 1522 for GTP/trunk/Lib

Timestamp:

09/27/06 19:23:51 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• BvHierarchy.cpp (modified) (5 diffs)
• Environment.cpp (modified) (1 diff)
• GvsPreprocessor.cpp (modified) (9 diffs)
• GvsPreprocessor.h (modified) (3 diffs)
• HierarchyManager.cpp (modified) (5 diffs)
• Preprocessor.cpp (modified) (1 diff)
• RayCaster.cpp (modified) (1 diff)
• ViewCellsManager.cpp (modified) (1 diff)
• VspTree.cpp (modified) (4 diffs)
• main.cpp (modified) (1 diff)

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

@@ -489 +489 @@
         const float renderCostDecr = oldRenderCost - newRenderCost;
 
-//#ifdef _DEBUG
+#ifdef _DEBUG
         Debug << "old render cost: " << oldRenderCost << endl;
         Debug << "new render cost: " << newRenderCost << endl;
         Debug << "render cost decrease: " << renderCostDecr << endl;
-//#endif
+#endif
         splitCandidate.SetRenderCostDecrease(renderCostDecr);
 
@@ -527 +527 @@
                 (0
                 || (mBvhStats.Leaves() >= mTermMaxLeaves)
-                || (mBvhStats.mGlobalCostMisses >= mTermGlobalCostMissTolerance)
+                //|| (mBvhStats.mGlobalCostMisses >= mTermGlobalCostMissTolerance)
                 //|| mOutOfMemory 
                 );
@@ -974 +974 @@
 
 #ifdef _DEBUG
-        Debug << "\n§§§§ eval local cost §§§§" << endl
+        Debug << "\n§§§§ bvh eval const decrease §§§§" << endl
                   << "back pvs: " << (int)objectsBack.size() << " front pvs: " << (int)objectsFront.size() << " total pvs: " << nTotalObjects << endl 
                   << "back p: " << volBack / viewSpaceVol << " front p " << volFront / viewSpaceVol << " p: " << totalVol / viewSpaceVol << endl
@@ -1656 +1656 @@
                                                                                                            const ObjectContainer &objects)
 {
-        ///////////////////////////////////////////////////////////////
-        //-- note matt: we assume that we have objects sorted by their id => 
+        ///////////////////////////////////////
+        //-- we assume that we have objects sorted by their id => 
         //-- we don't have to sort them here and an binary search 
         //-- for identifying if a object is in a leaf.
@@ -1665 +1665 @@
 
         mBvhStats.nodes = 1;
-        
-        
+                
         // store pointer to this tree
         BvhSubdivisionCandidate::sBvHierarchy = this;

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

@@ -1272 +1272 @@
    RegisterOption("GvsPreprocessor.epsilon",
                  optFloat,
-                 "gvs_epsilon",
+                 "gvs_epsilon=",
                  "0.00001");
 
     RegisterOption("GvsPreprocessor.threshold",
                  optFloat,
-                 "gvs_threshold",
+                 "gvs_threshold=",
                  "1.5");
 

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

@@ -8 +8 @@
 #include "Plane3.h"
 #include "RayCaster.h"
+#include "Exporter.h"
 
 
@@ -13 +14 @@
 {
   
+struct VizStruct
+{
+        Polygon3 *enlargedTriangle;
+        Triangle3 originalTriangle;
+        VssRay *ray;
+};
+
+static vector<VizStruct> vizContainer;
 
 GvsPreprocessor::GvsPreprocessor(): Preprocessor(), mSamplingType(0)
@@ -59 +68 @@
 bool GvsPreprocessor::HandleRay(VssRay *vssRay)
 {
-        if (mViewCellsManager->ComputeSampleContribution(*vssRay, true, false))
+        const int oldContri = vssRay->mPvsContribution;
+        mViewCellsManager->ComputeSampleContribution(*vssRay, true, false);
+
+        if ((vssRay->mPvsContribution - oldContri) > 0) // new contribution
         {
                 //cout << "h";
                 mRayQueue.push(vssRay);
+                mVssRays.push_back(new VssRay(*vssRay));
                 return true;
         }
@@ -159 +172 @@
         
                 VssRay *newRay = mRayCaster->CastSingleRay(sray.mOrigin, sray.mDirection, 1, mViewSpaceBox);
-                bool addedToQueue = HandleRay(newRay);
+
+                if (!newRay) return 0;
+                const bool enqueued = HandleRay(newRay);
                 
                 const int s1 = SubdivideEdge(hitTriangle, p1, p, x, *newRay, oldRay);
@@ -165 +180 @@
                 return s1 + s2;
                 
-                if (!addedToQueue)
+                if (!enqueued)
                         delete newRay;
         }
@@ -181 +196 @@
         {
                 hitTriangle = dynamic_cast<TriangleIntersectable *>(tObj)->GetItem();
+                cout << "t: " << hitTriangle << endl << endl;
+        }
+        else
+        {
+                cout << "not yet implemented" << endl;
         }
 
@@ -200 +220 @@
         }
 
+        VizStruct dummy;
+        dummy.enlargedTriangle = new Polygon3(enlargedTriangle);
+        dummy.originalTriangle = hitTriangle;
+        //dummy.ray = new VssRay(currentRay);
+        vizContainer.push_back(dummy);
+
         // establish visibility
         VssRayContainer vssRays;
         CastRays(simpleRays, vssRays, false);
+
         // add to ray queue
         EnqueueRays(vssRays);
-/*
+#if 0
     // recursivly subdivide each edge
         for (int i = 0; i < 9; ++ i)
@@ -217 +244 @@
                         currentRay);
         }
-*/
+#endif
         return (int)vssRays.size();
 }
@@ -375 +402 @@
         }
 
+        Visualize();    
         return true;
 }
 
-}
+
+void GvsPreprocessor::Visualize()
+{
+        Exporter *exporter = Exporter::GetExporter("gvs.wrl");
+
+        if (!exporter)
+                return;
+        
+        vector<VizStruct>::const_iterator vit, vit_end = vizContainer.end();
+        for (vit = vizContainer.begin(); vit != vit_end; ++ vit)
+        {
+                cout << "v";
+                exporter->ExportPolygon((*vit).enlargedTriangle);
+                //Material m;
+                //Polygon3 poly = Polygon3((*vit).originalTriangle);
+//              exporter->ExportPolygon(&poly);
+        }
+
+        exporter->ExportRays(mVssRays);
+        delete exporter;
+}
+
+}

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

@@ -100 +100 @@
         void EnqueueRays(VssRayContainer &samples);
 
-        /** 
-                Hepler function for adaptive border sampling. It finds 
+        /** Hepler function for adaptive border sampling. It finds 
                 new sample points around a triangle in a eps environment
         */
@@ -116 +115 @@
                 const VssRay &oldRay);
 
+        void Visualize();
         //////////////////////
 
@@ -128 +128 @@
         float mEps;
         float mThreshold;
+        VssRayContainer mVssRays;
 };
 

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

@@ -243 +243 @@
                 );
 
-        if (1 && terminationCriteriaMet)
+        if (0 && terminationCriteriaMet)
         {
                 Debug << "hierarchy global termination criteria met:" << endl;
@@ -331 +331 @@
         cout << "\nstarting view space hierarchy construction ... " << endl;
 
+        mHierarchyStats.mGlobalCostMisses = 0; // hack: reset global cost misses
+
         RayInfoContainer *viewSpaceRays = new RayInfoContainer();
         SubdivisionCandidate *vsc = 
@@ -345 +347 @@
                                                                                                          const ObjectContainer &objects)
 {
+        mHierarchyStats.mGlobalCostMisses = 0; // hack: reset global cost misses
+
         if (mObjectSpaceSubdivisionType == KD_BASED_OBJ_SUBDIV)
         {
@@ -407 +411 @@
                 // cost ratio of cost decrease / totalCost
                 const float costRatio = mCurrentCandidate->GetRenderCostDecrease() / mTotalCost;
-                Debug << "ratio: " << costRatio << " min ratio: " << mTermMinGlobalCostRatio << endl;
+                //Debug << "ratio: " << costRatio << " min ratio: " << mTermMinGlobalCostRatio << endl;
         
                 if (costRatio < mTermMinGlobalCostRatio)
@@ -606 +610 @@
         cout << "\nresetting bv hierarchy" << endl;
         mHierarchyStats.nodes -= mBvHierarchy->mBvhStats.nodes;
-        mHierarchyStats.mGlobalCostMisses = 0; // hack: reset global cost misses
+        
         DEL_PTR(mBvHierarchy);
         mBvHierarchy = new BvHierarchy();

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

@@ -434 +434 @@
                 cout << "loading view cells from " << buf << endl;
                 mViewCellsManager = ViewCellsManager::LoadViewCells(buf, &mObjects, true);
+                if (!mViewCellsManager)
+                        return false;
         }
         else

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

@@ -32 +32 @@
         if (!rays.empty())
                 return rays.back();
+        else
+                return NULL;
 }
 

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

@@ -1830 +1830 @@
         {
                 ViewCell *viewcell = *it;
-
-                if (viewcell->GetValid())
-                {
-                        // if ray not outside of view space
+                
+                if (viewcell->GetValid()) // tests if view cellis in valid view space
+                {
                         float contribution;
 

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

@@ -562 +562 @@
                 // || mOutOfMemory
                 || (mVspStats.Leaves() >= mMaxViewCells)
-        || (mVspStats.mGlobalCostMisses >= mTermGlobalCostMissTolerance) 
+      //  || (mVspStats.mGlobalCostMisses >= mTermGlobalCostMissTolerance) 
                 );
 
@@ -571 +571 @@
                 Debug << "leaves: " << mVspStats.Leaves() << " " <<  mMaxViewCells << endl;
         }
+
         return terminationCriteriaMet;
 }
@@ -1482 +1483 @@
         const float renderCostDecrease = (oldRenderCost - newRenderCost) / viewSpaceVol;
 
-//#ifdef _DEBUG
+#ifdef _DEBUG
         Debug << "\nvsp render cost decrease" << endl
                   << "back pvs: " << pvsBack << " front pvs " << pvsFront << " total pvs: " << totalPvs << endl 
@@ -1488 +1489 @@
                   << "old rc: " << normalizedOldRenderCost << " new rc: " << newRenderCost / viewSpaceVol << endl
                   << "render cost decrease: " << renderCostDecrease << endl;
-//#endif
+#endif
         return renderCostDecrease;
 }

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

@@ -164 +164 @@
 
         // parse view cells related options
-        preprocessor->PrepareViewCells();
+        if (!preprocessor->PrepareViewCells())
+        {
+                Cleanup();
+                exit(1);
+        }
 
         if (0)