Changeset 117 for trunk/VUT/Ogre

Timestamp:

05/30/05 08:09:49 (20 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/Ogre

Files:

• include/OgreSolidBoundingBox.h (modified) (1 diff)
• include/OgreSolidHalfBoundingBox.h (modified) (1 diff)
• src/OgreSolidBoundingBox.cpp (modified) (1 diff)
• src/OgreSolidHalfBoundingBox.cpp (modified) (2 diffs)
• src/OgreVisibilityTerrainSceneManager.cpp (modified) (1 diff)

trunk/VUT/Ogre/include/OgreSolidBoundingBox.h

@@ -32 +32 @@
                 /** 
                         Sets the material used for occlusion queries. 
-                        @remark the material is called "QueryMaterial" and
+                        @remark the material is called "Visibility/QueryMaterial" and
                         uses no lighting, no depth write, and no colours
                 */

trunk/VUT/Ogre/include/OgreSolidHalfBoundingBox.h

@@ -32 +32 @@
         /** 
                 Sets the material used for occlusion queries. 
-                @remark the material is called "QueryMaterial" and
+                @remark the material is called "Visibility/QueryMaterial" and
                 uses no lighting, no depth write, and no colours
         */

trunk/VUT/Ogre/src/OgreSolidBoundingBox.cpp

@@ -120 +120 @@
 void SolidBoundingBox::SetOcclusionQueryMaterial()
 {
-        m_pMaterial = MaterialManager::getSingleton().getByName("QueryMaterial");
+        m_pMaterial = MaterialManager::getSingleton().getByName("Visibility/QueryMaterial");
 
         if (m_pMaterial.isNull())
         {
                 m_pMaterial = MaterialManager::getSingleton().
-                        create("QueryMaterial", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
+                        create("Visibility/QueryMaterial", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
 
-                m_pMaterial->setColourWriteEnabled(false);
-                m_pMaterial->setDepthWriteEnabled(false);
-                m_pMaterial->setLightingEnabled(false);
+                Pass *queryPass = m_pMaterial->getTechnique(0)->getPass(0);
+                queryPass->setColourWriteEnabled(false);
+                queryPass->setDepthWriteEnabled(false);
+                queryPass->setLightingEnabled(false);
         }
 
-        setMaterial("QueryMaterial");
+        setMaterial("Visibility/QueryMaterial");
 }
 

trunk/VUT/Ogre/src/OgreSolidHalfBoundingBox.cpp

@@ -87 +87 @@
 void SolidHalfBoundingBox::SetOcclusionQueryMaterial( void )
 {
-        m_pMaterial = MaterialManager::getSingleton().getByName("QueryMaterial");
+        m_pMaterial = MaterialManager::getSingleton().getByName("Visibility/QueryMaterial");
 
         if (m_pMaterial.isNull())
         {
                 m_pMaterial = MaterialManager::getSingleton().
-                        create("QueryMaterial", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
+                        create("Visibility/QueryMaterial", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
         }
 
@@ -99 +99 @@
         m_pMaterial->setLightingEnabled(false);
 
-        setMaterial("QueryMaterial");
+        setMaterial("Visibility/QueryMaterial");
 }
 

trunk/VUT/Ogre/src/OgreVisibilityTerrainSceneManager.cpp

@@ -51 +51 @@
                 mDepthPass->setDepthWriteEnabled(true);
                 mDepthPass->setLightingEnabled(false);
-                depthMat->load();
+                //depthMat->load();
         }
         else