Changeset 1232 for GTP/trunk/Lib/Vis/OnlineCullingCHC

Timestamp:

08/19/06 13:48:51 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC

Files:

• OGRE/src/OgreKdTreeSceneManager.cpp (modified) (5 diffs)
• OGRE/src/OgreOcclusionCullingSceneManager.cpp (modified) (5 diffs)
• src/GtpVisibility.vcproj (modified) (2 diffs)

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

@@ -1109 +1109 @@
 }
 //-----------------------------------------------------------------------
-const Pass *KdTreeSceneManager::_setPass(Pass* pass, bool evenIfSuppressed)
+const Pass *KdTreeSceneManager::_setPass(const Pass* pass, bool evenIfSuppressed)
 {
         if (mRenderMethod == KdTree::KDRM_INTERNAL)
@@ -1122 +1122 @@
         const bool useDepthPass = 
                 (mIsDepthPassPhase && !mHierarchyInterface->IsBoundingBoxQuery());
-
-        Pass *usedPass = useDepthPass ? mDepthPass : pass;
-
 
         const IlluminationRenderStage savedStage = mIlluminationStage; 
@@ -1158 +1155 @@
         }
 
+        const Pass *usedPass = useDepthPass ? mDepthPass : pass;
+
         // save old depth write: needed for item buffer
         const bool IsDepthWrite = usedPass->getDepthWriteEnabled();
@@ -1164 +1163 @@
         if (!mEnableDepthWrite)
         {
-                usedPass->setDepthWriteEnabled(false);
+        //      usedPass->setDepthWriteEnabled(false);
         }
         //else if (mIsItemBufferPass) {usedPass = mItemBufferPass;}
@@ -1176 +1175 @@
         if (!mEnableDepthWrite)
         {
-                usedPass->setDepthWriteEnabled(IsDepthWrite);
+        //      usedPass->setDepthWriteEnabled(IsDepthWrite);
         }
 

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

@@ -207 +207 @@
 }
 //-----------------------------------------------------------------------
-const Pass *OcclusionCullingSceneManager::_setPass(Pass* pass, bool evenIfSuppressed)
+const Pass *OcclusionCullingSceneManager::_setPass(const Pass* pass, bool evenIfSuppressed)
 {
         if (NORMAL_RENDER_HACK)
@@ -220 +220 @@
         const bool useDepthPass = 
                 (mIsDepthPassPhase && !mHierarchyInterface->IsBoundingBoxQuery());
-
-        Pass *usedPass = useDepthPass ? mDepthPass : pass;
-                
 
         const IlluminationRenderStage savedStage = mIlluminationStage; 
@@ -256 +253 @@
         }
         
+        const Pass *usedPass = useDepthPass ? mDepthPass : pass;
+
         // save old depth write: needed for item buffer
         const bool IsDepthWrite = usedPass->getDepthWriteEnabled();
@@ -262 +261 @@
         if (!mEnableDepthWrite)
         {
-                usedPass->setDepthWriteEnabled(false);
+                //usedPass->setDepthWriteEnabled(false);
         }
         //else if (mIsItemBufferPass) {usedPass = mItemBufferPass;}
@@ -274 +273 @@
         if (!mEnableDepthWrite)
         {
-                usedPass->setDepthWriteEnabled(IsDepthWrite);
+                //usedPass->setDepthWriteEnabled(IsDepthWrite);
         }
 

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

@@ -128 +128 @@
                         </File>
                         <File
-                                RelativePath="..\include\QueryManager.h">
-                        </File>
-                        <File
                                 RelativePath="..\src\StopAndWaitCullingManager.cpp">
                         </File>
@@ -175 +172 @@
                         </File>
                         <File
+                                RelativePath="..\include\QueryManager.h">
+                        </File>
+                        <File
                                 RelativePath="..\include\StopAndWaitCullingManager.h">
                         </File>