Changeset 2615 for GTP/trunk/Lib/Vis/Preprocessing/src/GvsPreprocessor.cpp

Timestamp:

01/19/08 05:28:24 (16 years ago)

Author:

mattausch

Message:

did some stuff for the visualization

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/GvsPreprocessor.cpp (modified) (11 diffs)

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

@@ -48 +48 @@
         Environment::GetSingleton()->GetBoolValue("Preprocessor.evaluatePixelError", mEvaluatePixelError);
 
+        Environment::GetSingleton()->GetBoolValue("ViewCells.useKdPvs", mUseKdPvs);
+
+
         char gvsStatsLog[100];
         Environment::GetSingleton()->GetStringValue("GvsPreprocessor.stats", gvsStatsLog);
@@ -183 +186 @@
                         obj->mCounter = 1;
                         mTrianglePvs.push_back(obj);
-
-                        /*mViewCellsManager->ComputeSampleContribution(ray, 
-                                                                                                         true, 
-                                                                                                         mCurrentViewCell,
-                                                                                                         true);*/
+                
+                        if (mUseKdPvs)
+                        {
+                                KdNode *node = mKdTree->GetPvsNode(ray.mTermination);
+
+                                if (!node->Mailed())
+                                {
+                                        node->Mail();
+                                        mKdPvs.push_back(mKdTree->GetOrCreateKdIntersectable(node));
+                                }                       
+                        }
                         
                         result = true;
@@ -863 +872 @@
         for (lit = leaves.begin(); lit != leaves.end(); ++ lit)
         {
-                KdLeaf *leaf = *lit;
+        KdLeaf *leaf = *lit;
+                
+                if (mUseKdPvs)
+                        mKdPvs.push_back(mKdTree->GetOrCreateKdIntersectable(leaf));
+
                 ObjectContainer::const_iterator oit, oit_end = leaf->mObjects.end();
 
@@ -892 +905 @@
                 (*oit)->mCounter = 0;
         }
-        int dummy = 0;
+        
+        
         while (NextViewCell())// && (dummy < 3))
         {
@@ -898 +912 @@
                 //if (mProcessedViewCells < 53) continue;
         
+                if (mUseKdPvs)
+                {
+                        KdNode::NewMail();
+                        mKdPvs.clear();
+                }
+
                 long startTime = GetTime();
                 cout << "\n***********************\n" 
@@ -910 +930 @@
                 mGvsStats.mTotalTrianglePvs += mGvsStats.mTrianglePvs;
 
-                ObjectContainer objectPvs;
-
-                // exchange triangle pvs with objects
-                //UpdatePvs(mCurrentViewCell);
-        GetObjectPvs(objectPvs);
-
-                // add pvs
-                ObjectContainer::const_iterator it, it_end = objectPvs.end();
-
-                for (it = objectPvs.begin(); it != it_end; ++ it)
-                {
-                        mCurrentViewCell->GetPvs().AddSampleDirty(*it, 1.0f);
-                }
-
-                cout << "triangle pvs of " << (int)mTrianglePvs.size() 
-                         << " was converted to object pvs of " << (int)objectPvs.size() << endl;
-                
+                if (!mUseKdPvs)
+                {
+                        ObjectContainer objectPvs;
+
+                        // optain object pvs
+                        GetObjectPvs(objectPvs);
+
+                        // add pvs
+                        ObjectContainer::const_iterator it, it_end = objectPvs.end();
+
+                        for (it = objectPvs.begin(); it != it_end; ++ it)
+                        {
+                                mCurrentViewCell->GetPvs().AddSampleDirty(*it, 1.0f);
+                        }
+
+                        cout << "triangle pvs of " << (int)mTrianglePvs.size() 
+                                << " was converted to object pvs of " << (int)objectPvs.size() << endl;
+
+                        mGvsStats.mPerViewCellPvs = (int)objectPvs.size();
+                }
+                else
+                {
+                        // add pvs
+                        ObjectContainer::const_iterator it, it_end = mKdPvs.end();
+
+                        for (it = mKdPvs.begin(); it != it_end; ++ it)
+                        {
+                                mCurrentViewCell->GetPvs().AddSampleDirty(*it, 1.0f);
+                        }
+
+                        mGvsStats.mPerViewCellPvs = mKdPvs.size();
+                }
 
                 ////////
@@ -932 +967 @@
                 
                 mGvsStats.mViewCells = mProcessedViewCells;//mPass;
-                //mGvsStats.mPerViewCellPvs = mCurrentViewCell->GetPvs().GetSize();
-                mGvsStats.mPerViewCellPvs = (int)objectPvs.size();
+                
 
                 mGvsStats.mTotalPvs += mGvsStats.mPerViewCellPvs;
@@ -950 +984 @@
 
         mTrianglePvs.clear();
-
+#if 0
                 if (GVS_DEBUG)
                 {
@@ -957 +991 @@
                         CLEAR_CONTAINER(mVssRays);
                 }
-
-                // is this really necessary?
-                //ClearRayQueue();
                 cout << "finished" << endl;
+
                 if (mEvaluatePixelError || mExportVisibility)
                 {
                         StorePvs(objectPvs);
                 }
+#endif
         }
 }
@@ -1039 +1072 @@
 
         BvhLeaf::NewMail();
+        //KdNode::NewMail();
 
         ObjectContainer::const_iterator oit, oit_end = mTrianglePvs.end();
@@ -1053 +1087 @@
                 if (!bv || bv->Mailed())
                         continue;
-                
+
                 bv->Mail();
-
                 objectPvs.push_back(bv);
         }