Changeset 722

Timestamp:

03/31/06 20:31:55 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis

Files:

• OnlineCullingCHC/OGRE/scripts/Plugin_VisibilitySceneManager.vcproj (modified) (1 diff)
• OnlineCullingCHC/OGRE/src/OgreOctreeHierarchyInterface.cpp (modified) (1 diff)
• OnlineCullingCHC/OGRE/src/OgreSolidBoundingBox.cpp (modified) (2 diffs)
• OnlineCullingCHC/include/DistanceQueue.h (modified) (1 diff)
• OnlineCullingCHC/src/VisibilityManager.cpp (modified) (1 diff)
• Preprocessing/scripts/Preprocessor.vcproj (modified) (1 diff)
• Preprocessing/src/Environment.cpp (modified) (1 diff)
• Preprocessing/src/ViewCellsManager.cpp (modified) (4 diffs)
• Preprocessing/src/ViewCellsManager.h (modified) (1 diff)
• shared/EvalStats/EvalStats.vcproj (modified) (1 diff)

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/scripts/Plugin_VisibilitySceneManager.vcproj

@@ -266 +266 @@
                         </Filter>
                 </Filter>
+                <File
+                        RelativePath=".\VTune\Plugin_VisibilitySceneManager.vpj">
+                </File>
         </Files>
         <Globals>

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

@@ -51 +51 @@
 bool OctreeHierarchyInterface::HasGeometry(GtpVisibility::HierarchyNode *node) const
 {
-        return static_cast<Octree *>(node)->mNodes.size() > 0;
+        return !(static_cast<Octree *>(node))->mNodes.empty();
 }
 //-----------------------------------------------------------------------
 float OctreeHierarchyInterface::GetSquaredDistance(GtpVisibility::HierarchyNode *node) const
 {
-        AxisAlignedBox *box = &static_cast<Octree *>(node)->mBox;
-        Vector3 pos = ((box->getMaximum() - box->getMinimum()) * 0.5) + box->getMinimum();
+        LogManager::getSingleton().logMessage("here4");
+
+        const AxisAlignedBox &box = static_cast<Octree *>(node)->mBox;
+        const Vector3 pos = ((box.getMaximum() - box.getMinimum()) * 0.5) + box.getMinimum();
         
         return (mCullCamera->getDerivedPosition() - pos).squaredLength();

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

@@ -9 +9 @@
 #include <OgrePass.h>
 #include <OgreTechnique.h>
+#include <OgreLogManager.h>
 
 namespace Ogre {
@@ -157 +158 @@
 Real SolidBoundingBox::getSquaredViewDepth(const Camera* cam) const
 {
-        Vector3 min, max, mid, dist;
-
-        min = mBox.getMinimum();
-        max = mBox.getMaximum();
-        mid = ((min - max) * 0.5) + min;
-        dist = cam->getDerivedPosition() - mid;
+        Ogre::LogManager::getSingleton().logMessage("here3");
+        const Vector3 &min = mBox.getMinimum();
+        const Vector3 &max = mBox.getMaximum();
+        const Vector3 &mid = ((min - max) * 0.5) + min;
+        const Vector3 &dist = cam->getDerivedPosition() - mid;
 
         return dist.squaredLength();

GTP/trunk/Lib/Vis/OnlineCullingCHC/include/DistanceQueue.h

@@ -25 +25 @@
         bool operator() (T v1, T v2) const
         {
-                return mHierarchyInterface->GetSquaredDistance(v1) > mHierarchyInterface->GetSquaredDistance(v2);
+                return false;//mHierarchyInterface->GetSquaredDistance(v1) > mHierarchyInterface->GetSquaredDistance(v2);
         }
                 

GTP/trunk/Lib/Vis/OnlineCullingCHC/src/VisibilityManager.cpp

@@ -11 +11 @@
 //-----------------------------------------------------------------------
 VisibilityManager::VisibilityManager(VisibilityEnvironment *visEnvironment):
-mVisibilityThreshold(0), mCullingManager(NULL),
+mVisibilityThreshold(0), 
+mCullingManager(NULL),
 mQueryManager(NULL),
 mPreprocessingManager(new DummyPreprocessingManager(NULL)),

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

@@ -495 +495 @@
                         </File>
                 </Filter>
+                <File
+                        RelativePath=".\VTune\Preprocessor.vpj">
+                </File>
         </Files>
         <Globals>

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

@@ -1279 +1279 @@
                                         "8000000");
 
+        RegisterOption("ViewCells.Evaluation.samplingType",
+                        optString,
+                        "view_cells_evaluation_sampling_type=",
+                        "box");
+
         RegisterOption("ViewCells.Evaluation.samplesPerPass",
                                         optInt,

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

@@ -97 +97 @@
         
         if (strcmp(buf, "box") == 0)
+        {
                 mSamplingType = Preprocessor::SPATIAL_BOX_BASED_DISTRIBUTION;
+        }
         else if (strcmp(buf, "directional") == 0)
+        {
                 mSamplingType = Preprocessor::DIRECTION_BASED_DISTRIBUTION;
+        }
         else 
         {
@@ -106 +110 @@
         }
 
-        environment->GetStringValue("ViewCells.Visualization.colorCode", buf);
+        environment->GetStringValue("ViewCells.Evaluation.samplingType", buf);
+        
+        if (strcmp(buf, "box") == 0)
+        {
+                mEvaluationSamplingType = Preprocessor::SPATIAL_BOX_BASED_DISTRIBUTION;
+        }
+        else if (strcmp(buf, "directional") == 0)
+        {
+                mEvaluationSamplingType = Preprocessor::DIRECTION_BASED_DISTRIBUTION;
+        }
+        else 
+        {
+                Debug << "error! wrong sampling type" << endl;
+                exit(0);
+        }
+
+    environment->GetStringValue("ViewCells.Visualization.colorCode", buf);
 
         if (strcmp(buf, "PVS") == 0)
@@ -492 +512 @@
         //VssRayContainer outRays;
         // should directional sampling be used?
-        bool dirSamples = mSamplingType == Preprocessor::DIRECTION_BASED_DISTRIBUTION;
+        bool dirSamples = (mEvaluationSamplingType == Preprocessor::DIRECTION_BASED_DISTRIBUTION);
 
         cout << "Evaluating view cell partition" << endl;
@@ -521 +541 @@
                 VssRayContainer evaluationSamples;
 
-                const int samplingType = mSamplingType;
+                const int samplingType = mEvaluationSamplingType;
                 /*      dirSamples ? 
                                                 Preprocessor::DIRECTION_BASED_DISTRIBUTION :

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

@@ -549 +549 @@
 
         int mSamplingType;
+        int mEvaluationSamplingType;
         int mNumActiveViewCells;
         bool mCompressViewCells;

GTP/trunk/Lib/Vis/shared/EvalStats/EvalStats.vcproj

@@ -146 +146 @@
                 </Filter>
                 <File
+                        RelativePath=".\VTune\EvalStats.vpj">
+                </File>
+                <File
                         RelativePath=".\ReadMe.txt">
                 </File>