Changeset 2278 for GTP/trunk/Lib/Vis/OnlineCullingCHC/src

Timestamp:

03/22/07 11:48:21 (18 years ago)

Author:

mattausch

Message:

worked on randomupdatemanager

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC/src

Files:

• GtpVisibility.vcproj (modified) (1 diff)
• RandomUpdateCullingManager.cpp (modified) (1 diff)
• VisibilityEnvironment.cpp (modified) (5 diffs)
• VisibilityManager.cpp (modified) (3 diffs)

GTP/trunk/Lib/Vis/OnlineCullingCHC/src/GtpVisibility.vcproj

@@ -71 +71 @@
                                 OptimizeForProcessor="3"
                                 OptimizeForWindowsApplication="TRUE"
-                                AdditionalIncludeDirectories="..\include;"$(OGRE_PATH)\OgreMain\include";..\..\Preprocessing\src"
-                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+                                AdditionalIncludeDirectories="..\include;"$(OGRE_PATH)\OgreMain\include""
+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GTP_VISIBILITY_MODIFIED_OGRE;GAMETOOLS_ILLUMINATION_MODULE"
                                 StringPooling="TRUE"
                                 RuntimeLibrary="2"

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

@@ -106 +106 @@
                                         continue;
                                 }
-                                
+                                if (mHierarchyInterface->IsLeaf(node))
+                                {
+                                        if (mHierarchyInterface->IsNodeVisible(node))
+                                                Ogre::LogManager::getSingleton().logMessage("u");
+                                        else
+                                                Ogre::LogManager::getSingleton().logMessage("g");
+                                }
+
                                 if (mHierarchyInterface->IsNodeFullyVisible(node))
-                                {
+                                {Ogre::LogManager::getSingleton().logMessage("here8");
                                         // node fully visible => test only random leaves
                                         for (int i = 0; i < mRandomCandidates; ++ i)
                                         {
+                                                Ogre::LogManager::getSingleton().logMessage("z");
                                                 HierarchyNode *randomLeaf = mHierarchyInterface->GetRandomLeaf(node);
 

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

@@ -1 +1 @@
 #include "VisibilityEnvironment.h"
-#include "common.h"
-#include "Environment.h"
+//#include "common.h"
+//#include "Environment.h"
 
 
@@ -10 +10 @@
 {
         // HACK: loading debug stream should not happen here
-        GtpVisibilityPreprocessor::Debug.open("debug.log");
-        // load environment
-        //Environment::GetSingleton() = new GtpVisibilityPreprocessor::Environment::GetSingleton();      
+        //GtpVisibilityPreprocessor::Debug.open("debug.log");
 }
 //-----------------------------------------------------------------------
 VisibilityEnvironment::~VisibilityEnvironment()
 {
-        GtpVisibilityPreprocessor::Environment::DelSingleton();
+        //GtpVisibilityPreprocessor::Environment::DelSingleton();
 }
 //-----------------------------------------------------------------------
@@ -23 +21 @@
 {               
         //-- parse environment
-        return GtpVisibilityPreprocessor::Environment::GetSingleton()->ReadEnvFile(filename.c_str());
+        return false;//GtpVisibilityPreprocessor::Environment::GetSingleton()->ReadEnvFile(filename.c_str());
 }
 //-----------------------------------------------------------------------
@@ -29 +27 @@
 {
         char str[200];
-        GtpVisibilityPreprocessor::Environment::GetSingleton()->GetStringValue("Scene.filename", str);
+        //GtpVisibilityPreprocessor::Environment::GetSingleton()->GetStringValue("Scene.filename", str);
         return str;
 }
@@ -36 +34 @@
 {
         char str[200];
-        GtpVisibilityPreprocessor::Environment::GetSingleton()->GetStringValue("ViewCells.filename", str);
+        //GtpVisibilityPreprocessor::Environment::GetSingleton()->GetStringValue("ViewCells.filename", str);
         
         return str;
 }
 //-----------------------------------------------------------------------
-GtpVisibilityPreprocessor::Environment *VisibilityEnvironment::GetPreprocessorEnvironment()
+/*GtpVisibilityPreprocessor::Environment *VisibilityEnvironment::GetPreprocessorEnvironment()
 {
         return GtpVisibilityPreprocessor::Environment::GetSingleton();
-}
+}*/
+
 } // namespace GtpVisibility

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

@@ -5 +5 @@
 #include "DummyPreprocessingManager.h"
 #include "DummyQueryManager.h"
-//#include "BatchedQueriesCullingManager.h"
+#include "RandomUpdateCullingManager.h"
 
 namespace GtpVisibility {
@@ -53 +53 @@
                 case VisibilityEnvironment::STOP_AND_WAIT_CULLING:
                         mCullingManager = new StopAndWaitCullingManager();
-                                //new BatchedQueriesCullingManager();
                         break;
 
@@ -61 +60 @@
 
                 case VisibilityEnvironment::FRUSTUM_CULLING:
-                        mCullingManager = new FrustumCullingManager();
+                        //mCullingManager = new FrustumCullingManager();
+                        mCullingManager = new RandomUpdateCullingManager();
                         break;