Changeset 119 for trunk

Timestamp:

05/31/05 00:57:01 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT

Files:

• GtpVisibility/src/CoherentHierarchicalCullingManager.cpp (modified) (1 diff)
• Ogre/include/OgreVisibilityOctreeSceneManager.h (modified) (1 diff)
• Ogre/include/OgreVisibilityTerrainSceneManager.h (modified) (1 diff)
• Ogre/src/OgreVisibilityOctreeSceneManager.cpp (modified) (3 diffs)
• Ogre/src/OgreVisibilityTerrainSceneManager.cpp (modified) (5 diffs)
• scripts/GtpVisibility.suo (modified) (previous)

trunk/VUT/GtpVisibility/src/CoherentHierarchicalCullingManager.cpp

@@ -8 +8 @@
 {
         //InitFrame();
-        //Ogre::LogManager::getSingleton().logMessage("chc culling");
         QueryQueue queryQueue;
         unsigned int visiblePixels = 0;

trunk/VUT/Ogre/include/OgreVisibilityOctreeSceneManager.h

@@ -64 +64 @@
 protected:
         /** Creates material for depth pass, e.g., a pass that only fills the depth buffer */
-        void CreateDepthPass();
+        void InitDepthPass();
         void ShowVisualization(Camera *cam);
         OctreeHierarchyInterface *mHierarchyInterface;

trunk/VUT/Ogre/include/OgreVisibilityTerrainSceneManager.h

@@ -64 +64 @@
 protected:
         /** Creates material for depth pass, e.g., a pass that only fills the depth buffer */
-        void CreateDepthPass();
+        void InitDepthPass();
         void ShowVisualization(Camera *cam);
         OctreeHierarchyInterface *mHierarchyInterface;

trunk/VUT/Ogre/src/OgreVisibilityOctreeSceneManager.cpp

@@ -34 +34 @@
         // TODO: find reasonable value for max depth
         mMaxDepth = 50;
-
-        CreateDepthPass();
-}
-//-----------------------------------------------------------------------
-void VisibilityOctreeSceneManager::CreateDepthPass()
+}
+//-----------------------------------------------------------------------
+void VisibilityOctreeSceneManager::InitDepthPass()
 {
         MaterialPtr depthMat = MaterialManager::getSingleton().getByName("Visibility/DepthPass");
@@ -69 +67 @@
         // setting vertex program is not efficient
         //Pass *usedPass = ((mIsDepthPass && !pass->hasVertexProgram()) ? mDepthPass : pass);           
-        Pass *usedPass = (mIsDepthPass ? mDepthPass : pass);    
+        // set depth fill pass only if depth write enabled
+        Pass *usedPass = (mIsDepthPass && pass->getDepthWriteEnabled() ? mDepthPass : pass);
 
         if (mIsDepthPass)
@@ -166 +165 @@
 void VisibilityOctreeSceneManager::_renderVisibleObjects()
 {
+        // create material for depth pass
+        InitDepthPass();
+
         // visualization: apply standard rendering
         if (mShowVisualization)

trunk/VUT/Ogre/src/OgreVisibilityTerrainSceneManager.cpp

@@ -32 +32 @@
         // TODO: set maxdepth to reasonable value
         mMaxDepth = 50;
-        // create material for depth pass
-        CreateDepthPass();
-}
-//-----------------------------------------------------------------------
-void VisibilityTerrainSceneManager::CreateDepthPass()
+}
+//-----------------------------------------------------------------------
+void VisibilityTerrainSceneManager::InitDepthPass()
 {
         MaterialPtr depthMat = MaterialManager::getSingleton().getByName("Visibility/DepthPass");
@@ -64 +62 @@
 Pass *VisibilityTerrainSceneManager::setPass(Pass* pass)
 {
-        // setting vertex program is not efficient
-        //Pass *usedPass = ((mIsDepthPass && !pass->hasVertexProgram()) ? mDepthPass : pass);           
-        Pass *usedPass = (mIsDepthPass ? mDepthPass : pass);    
+        // set depth fill pass only if depth write enabled
+        Pass *usedPass = (mIsDepthPass && pass->getDepthWriteEnabled() ? mDepthPass : pass);
 
         if (mIsDepthPass)
         {
+                //if (pass->isTransparent())    return pass;
+
                 // set vertex program of current pass
-        if (pass->hasVertexProgram())
+        if (pass->hasVertexProgram() && (pass->getVertexProgramName() != mDepthPass->getVertexProgramName()))
                 {
                         mDepthPass->setVertexProgram(pass->getVertexProgramName());
@@ -79 +78 @@
                                 const GpuProgramPtr& prg = mDepthPass->getVertexProgram();
                                 // Load this program if not done already
-                                if (!prg->isLoaded())
-                                        prg->load();
+                                if (!prg->isLoaded()) prg->load();
                                 // Copy params
                                 mDepthPass->setVertexProgramParameters(pass->getVertexProgramParameters());
@@ -163 +161 @@
 void VisibilityTerrainSceneManager::_renderVisibleObjects()
 {
+        // create material for depth pass
+        InitDepthPass();
+
         // visualization: apply standard rendering
         if (mShowVisualization)
@@ -225 +226 @@
         if (mUseDepthPass)
         {
-                for (NodeList::iterator it = mVisible.begin(); it != mVisible.end(); ++it)
+                /*for (NodeList::iterator it = mVisible.begin(); it != mVisible.end(); ++it)
                 {
                         (*it)->_addToRenderQueue(mCameraInProgress, getRenderQueue(), false);
-                }
+                }*/
                 mIsDepthPass = false;
         }