Changeset 1193

Timestamp:

08/09/06 18:35:42 (18 years ago)

Author:

mattausch

Message:

bug fixed

Location:

GTP/trunk/Lib/Vis

Files:

• OnlineCullingCHC/OGRE/src/OgreOcclusionCullingSceneManager.cpp (modified) (1 diff)
• Preprocessing/src/Intersectable.h (modified) (1 diff)
• Preprocessing/src/VspBspTree.cpp (modified) (1 diff)
• Preprocessing/src/VspOspTree.cpp (modified) (19 diffs)

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreOcclusionCullingSceneManager.cpp

@@ -455 +455 @@
         getRenderQueue()->clear(); // finally clear render queue
         if (0) OGRE_DELETE(mRenderQueue); // HACK: should rather only be cleared ...
-
         if (0) WriteLog(); // write out stats
 }

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

@@ -34 +34 @@
   /// kd leaves that this intersectable belongs to
   //set<KdLeaf *> mKdLeaves;
-VssRayContainer mVssRays;
+  VssRayContainer mVssRays;
+
   /// # of object references
   int mReferences;

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

@@ -793 +793 @@
         
                 // if this a valid split => subdivide this node further
-                if (splitFurther) //-- continue subdivision
+
+                if (splitFurther)
                 {
                         newNode = SubdivideNode(splitPlane, tData, tFrontData, tBackData, coincident);

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

@@ -60 +60 @@
 {
         MailablePvsData *vdata = obj->mViewCellPvs.Find(vc);
-
+//return false;
         if (vdata)
         {
-                //Debug << "sumpdf: " << vdata->mSumPdf << endl;
                 // more than one view cell sees this object inside different kd cells
                 if (!checkOnlyMailed || !vdata->Mailed())
@@ -69 +68 @@
                         if (checkOnlyMailed)
                                 vdata->Mail();
-
+                        //Debug << "sumpdf: " << vdata->mSumPdf << endl;
                         if (vdata->mSumPdf > 1.5f) 
                                 return true;
@@ -3218 +3217 @@
         FilterRays(back, *tData.mRays, *backData.mRays);
 
+        ++ mOspStats.splits[splitPlane.mAxis];
 
         //-- eval view cells pvs
@@ -3467 +3467 @@
         const float minBox = box.Min(axis);
         const float maxBox = box.Max(axis);
+        Debug << "min: " << minBox << " max: " << maxBox << endl;
 
         const float sizeBox = maxBox - minBox;
@@ -3473 +3474 @@
         float maxBand = minBox + (1.0f - mSplitBorder) * (maxBox - minBox);
 
+        const float viewSpaceVol = mVspTree->GetBoundingBox().GetVolume();
+
         //-- sort so we can use a sweep
         SortSplitCandidates(tData, axis, minBand, maxBand);
 
-        float totalVol = 0;//PrepareHeuristics(tData);
+        float totalVol = 0;
         float voll = 0;
         float volr = totalVol;
 
         ViewCellContainer touchedViewCells;
+        
         const float totalRenderCost = PrepareHeuristics(tData, touchedViewCells);
         float renderCost = totalRenderCost;
@@ -3491 +3495 @@
 
         float sum = (float)totalVol * sizeBox;
+
+
+        Debug << "here82 render cost: " << renderCost / viewSpaceVol << endl;
 
         /////////////////////////////////
@@ -3511 +3518 @@
 
         debugVol = 0;
-        const float viewSpaceVol = mVspTree->GetBoundingBox().GetVolume();
+
 
 
@@ -3517 +3524 @@
         // the sweep heuristics
 
-        Intersectable::NewMail();
-        ViewCell::NewMail();
-                
+        
         //-- traverse through events and find best split plane
         
         vector<SortableEntry>::const_iterator ci, ci_end = mSplitCandidates->end();
+        //minRenderCost = RandomValue(0,viewSpaceVol);
 
         for (ci = mSplitCandidates->begin(); ci != ci_end; ++ ci)
@@ -3535 +3541 @@
 
                 // Note: sufficient to compare size of bounding boxes of front and back side?
-
                 if (((*ci).mPos >= minBand) && ((*ci).mPos <= maxBand))
                 {
                         float currentPos;
-                        
+                        Debug << "here29 : " << minRenderCost / viewSpaceVol << endl;
+
                         // HACK: current positition is BETWEEN visibility events
-                        if (1 && ((*ci).mType == SortableEntry::BOX_INTERSECT) && ((ci + 1) != ci_end))
+                        if (1 && /*((*ci).mType == SortableEntry::BOX_INTERSECT) &&*/ ((ci + 1) != ci_end))
                                 currentPos = ((*ci).mPos + (*(ci + 1)).mPos) * 0.5f;
                         else
@@ -3549 +3555 @@
                         {
                                 splitPlaneFound = true;
-                                Debug << "pos: " << position << endl;
                                 minRenderCost = renderCost;
                                 position = currentPos;
-                        }
-                }
-        }
-        
+                                Debug << "pos: " << position << endl;
+                        }
+                }
+        }
+//splitPlaneFound = true;
         if (splitPlaneFound)
         {
-                ratio = totalRenderCost / minRenderCost;
+                ratio = minRenderCost / totalRenderCost;
         }
 
@@ -3676 +3682 @@
                                                                 ViewCellContainer &touchedViewCells)
 {
-
         // collect view cells and set mail + counter
         ViewCellContainer viewCells;
@@ -3754 +3759 @@
                                                   float &renderCost)
 {
+        //Debug << "add contri to obj: " << obj->mMailbox - Intersectable::sMailId << endl;
         obj->Mail(2); // set as belonging to both leafs
 
@@ -3761 +3767 @@
         {
                 ViewCell *vc = *vit;
+                //Debug << "here30 vc mail " << vc->mMailbox - ViewCell::sMailId << endl;
 
                 // if obj not previously associated with this view cell => increase render cost
-                if (vc->Mailed(1) && 
-                        !ViewCellHasMultipleReferences(obj, vc, false))
-                {
+                if (vc->Mailed(1) && !ViewCellHasMultipleReferences(obj, vc, false))
+                {       
+                        //Debug << "add to rendercost: " << vc->GetVolume() / mVspTree->GetBoundingBox().GetVolume() << endl;
                         renderCost += vc->GetVolume();
                 }
@@ -3777 +3784 @@
                                                                 float &renderCost)
 {
+        //Debug << "subtract contri from obj: " << obj->mMailbox - Intersectable::sMailId << endl;
     obj->Mail(1); // set as belonging to back leaf
         ViewCellContainer::const_iterator vit, vit_end = touchedViewCells.end();
-        
+        
         for (vit = touchedViewCells.begin(); vit != vit_end; ++ vit)
         {
                 ViewCell *vc = *vit;
+
+                //Debug << "here6 " << vc->mMailbox - ViewCell::sMailId << endl;
 
                 // if obj was previously associated with this view cell but is not now 
                 // => decrease render cost
-                if (vc->Mailed() && 
-                        !ViewCellHasMultipleReferences(obj, vc, false))
-                {
+                if (vc->Mailed() &&     !ViewCellHasMultipleReferences(obj, vc, false))
+                {
+                        //Debug << "subtract from rendercost: " << vc->GetVolume() / mVspTree->GetBoundingBox().GetVolume() << endl;
                         renderCost -= vc->GetVolume();
                 }
@@ -3803 +3813 @@
         mVspTree->GetViewCells(VssRay(ray), viewCells);
 
-        /// classify view cells and compute volume contri accordingly
-        /// possible view cell classifications:
-        /// view cell mailed => view cell can be seen from left child node
-        /// view cell counter > 0 view cell can be seen from right child node
-        /// combined: view cell volume belongs to both nodes
+        // classify view cells and compute volume contri accordingly
+        // possible view cell classifications:
+        // view cell mailed => view cell can be seen from left child node
+        // view cell counter > 0 view cell can be seen from right child node
+        // combined: view cell volume belongs to both nodes
         ViewCellContainer::const_iterator vit, vit_end = viewCells.end();
         
@@ -3821 +3831 @@
                                                                            float &renderCost)
 {
-        // view cells can also be seen from left child node
+        //Debug << "**************" << endl;
+        //Debug << "vc contri: " << renderCost / mVspTree->GetBoundingBox().GetVolume() << " " << viewCell->mMailbox - ViewCell::sMailId << " counter: " << viewCell->mCounter << endl;
+
         const float vol = viewCell->GetVolume();
 
         if (viewCell->Mailed())
         {
-                viewCell->NewMail(2); // view cell can be seen from both nodes
+                viewCell->Mail(2); // view cell can be seen from both nodes
 
         // we now see view cell from both nodes => add contri
@@ -3836 +3848 @@
 
                         // was render cost already added?
-                        if (!ViewCellHasMultipleReferences(obj, viewCell, false) ||
+                        if (!ViewCellHasMultipleReferences(obj, viewCell, false) &&
                                 obj->Mailed(1))
                         {
-                                renderCost += viewCell->GetVolume();
+                                //Debug << "obj mail 1!! " << vol / mVspTree->GetBoundingBox().GetVolume() << endl;
+                                renderCost += vol;
                         }
                 }
@@ -3846 +3859 @@
         if (-- viewCell->mCounter == 0)
         {
-                ViewCell::NewMail(1); // view cell can be seen from back node only
+                viewCell->Mail(1); // view cell can be seen from back node only
 
                 //MailablePvsData::NewMail();
@@ -3856 +3869 @@
 
                         // can render cost be be reduced?
-                        if (!ViewCellHasMultipleReferences(obj, viewCell, false) ||
-                                obj->Mailed())
-                        {
-                                renderCost -= viewCell->GetVolume();
-                        }
-                }
-        }
+                        if (!ViewCellHasMultipleReferences(obj, viewCell, false) &&     obj->Mailed())
+                        {
+                                renderCost -= vol;
+                        }
+                }
+        }
+        //Debug << "new rc: " << renderCost / mVspTree->GetBoundingBox().GetVolume() << " counter2: " << viewCell->mCounter << endl;
+        //Debug << "**************"<<endl;
 }