Changeset 1149 for GTP/trunk/Lib/Vis/Preprocessing

Timestamp:

07/25/06 08:42:07 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• scripts/Preprocessor.vcproj (modified) (1 diff)
• src/Environment.cpp (modified) (1 diff)
• src/RayInfo.cpp (modified) (2 diffs)
• src/RayInfo.h (modified) (1 diff)
• src/VspBspTree.cpp (modified) (3 diffs)
• src/VspOspTree.cpp (modified) (6 diffs)
• src/VspOspTree.h (modified) (1 diff)

GTP/trunk/Lib/Vis/Preprocessing/scripts/Preprocessor.vcproj

@@ -20 +20 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="..\include;"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include";"$(QTDIR)\include\QtOpenGl";..\src;"$(CG_INC_PATH)";..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces"
+                                AdditionalIncludeDirectories="..\include;"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include";"$(QTDIR)\include\QtOpenGl";..\src;"$(CG_INC_PATH)";..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;"$(BOOST_INCLUDE)""
                                 PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
                                 MinimalRebuild="TRUE"

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

@@ -2217 +2217 @@
                                         "true");
         
+        RegisterOption("VspTree.maxTests",
+                                        optInt,
+                                        "vsp_max_tests=",
+                                        "2000");
 
 

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

@@ -165 +165 @@
 }
 
+
 float RayInfo::SqrSegmentLength() const
 {
@@ -170 +171 @@
 }
 
+
+void GetRayInfoSets(const RayInfoContainer &sourceRays,
+                    const int maxSize,
+                                        RayInfoContainer &usedRays,
+                                        RayInfoContainer *savedRays)
+{
+        const int limit = min(maxSize, (int)sourceRays.size());
+        const float prop = (float)limit / ((float)sourceRays.size() + Limits::Small);
+
+        RayInfoContainer::const_iterator it, it_end = sourceRays.end();
+
+        for (it = sourceRays.begin(); it != it_end; ++ it)
+        {
+                if (Random(1.0f) < prop)
+                        usedRays.push_back(*it);
+                else if (savedRays)
+                        savedRays->push_back(*it);
+        }
 }
+
+}

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

@@ -93 +93 @@
         int ComputeRayIntersection(const Plane3 &splitPlane, float &t) const;
 
-        /*friend void GetRaySets(const RayInfoContainer &sourceRays,
-                                                   const int maxSize,
-                                                   RayInfoContainer &usedRays,
-                                                   RayInfoContainer *savedRays) const;*/
+        friend void GetRayInfoSets(const RayInfoContainer &sourceRays,
+                const int maxSize,
+                RayInfoContainer &usedRays,
+                RayInfoContainer *savedRays = NULL);
 };
 

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

@@ -1358 +1358 @@
                                           float &position)
 {
-        RayInfoContainer usedRays, savedRays;
-
-/*      if (mMaxTests < rays.size())
-        {
-                GetRaySets(rays, mMaxTests, usedRays, savedRays);
+        RayInfoContainer usedRays;
+
+        if (mMaxTests < rays.size())
+        {
+                GetRayInfoSets(rays, mMaxTests, usedRays);
         }
         else
-        {*/
+        {
                 usedRays = rays;
-        //}
+        }
 
         const float minBox = box.Min(axis);
@@ -1405 +1405 @@
 
         // set all object as belonging to the front pvs
-        for(ri = rays.begin(); ri != ri_end; ++ ri)
+        for(ri = usedRays.begin(); ri != ri_end; ++ ri)
         {
                 Intersectable *oObject = (*ri).mRay->mOriginObject;
@@ -1500 +1500 @@
                         
                         // HACK: current positition is BETWEEN visibility events
-                        if ((ci + 1) != ci_end)
+                        if (0 && ((ci + 1) != ci_end))
+                        {
                                 currentPos = ((*ci).value + (*(ci + 1)).value) * 0.5f;
+                        }
                         else
-                                currentPos = (*ci).value;                       
+                currentPos = (*ci).value;                       
 
                         //Debug  << "pos=" << (*ci).value << "\t pvs=(" <<  pvsl << "," << pvsr << ")" << endl;

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

@@ -413 +413 @@
         Environment::GetSingleton()->GetBoolValue("VspTree.splitUseOnlyDrivingAxis", mOnlyDrivingAxis);
         
-        //Environment::GetSingleton()->GetFloatValue("VspTree.maxTotalMemory", mMaxTotalMemory);
+        Environment::GetSingleton()->GetIntValue("VspTree.maxTests", mMaxTests);
         Environment::GetSingleton()->GetFloatValue("VspTree.maxStaticMemory", mMaxMemory);
 
@@ -1390 +1390 @@
                                                                            float &position)
 {
-        RayInfoContainer *rays = tData.mRays;
+        RayInfoContainer usedRays;
+
+        if (mMaxTests < (int)tData.mRays->size())
+        {
+                GetRayInfoSets(*tData.mRays, mMaxTests, usedRays);
+        }
+        else
+        {
+                usedRays = *tData.mRays;
+        }
+
         int pvsSize = tData.mPvs;
 
@@ -1401 +1411 @@
         const float maxBand = minBox + mMaxBand * sizeBox;
 
-        SortSplitCandidates(*rays, axis, minBand, maxBand);
+        SortSplitCandidates(usedRays, axis, minBand, maxBand);
 
         // prepare the sweep
         // (note: returns pvs size, so there would be no need 
         // to give pvs size as argument)
-        pvsSize = PrepareHeuristics(*rays);
+        pvsSize = PrepareHeuristics(usedRays);
 
         // go through the lists, count the number of objects left and right
@@ -1448 +1458 @@
                         
                         // HACK: current positition is BETWEEN visibility events
-                        if ((ci + 1) != ci_end)
+                        if (0 && ((ci + 1) != ci_end))
                                 currentPos = ((*ci).value + (*(ci + 1)).value) * 0.5f;
                         else
@@ -3295 +3305 @@
                         
                         // HACK: current positition is BETWEEN visibility events
-                        if ((ci + 1) != ci_end)
+                        if (0 && ((ci + 1) != ci_end))
                                 currentPos = ((*ci).mPos + (*(ci + 1)).mPos) * 0.5f;
                         else
@@ -3301 +3311 @@
 
                         // note matt: can happen that volr is less than zero: bug or numerical error?
-                        //if (volr < 0)         Debug << "warning!! " << totalVol << " " << volRightDecr << " " << volRightDecr - totalVol << endl;
+                        //if (volr < 0) Debug << "warning!";
 
                         /*Debug << "pos: " << (*ci).mPos 

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

@@ -1133 +1133 @@
         /// weight between render cost decrease and node render cost
         float mRenderCostDecreaseWeight;
+
+        int mMaxTests;
 };