Changeset 133 for trunk/VUT/Ogre

Timestamp:

06/15/05 01:18:51 (19 years ago)

Author:

mattausch

Message:

fixed some bugs

Location:

trunk/VUT/Ogre

Files:

• include/OgrePlatformQueryManager.h (added)
• include/OgreVisibilityTerrainSceneManager.h (modified) (2 diffs)
• src/OgrePlatformHierarchyInterface.cpp (modified) (1 diff)
• src/OgrePlatformQueryManager.cpp (added)
• src/OgreVisibilitySceneManagerDll.cpp (modified) (3 diffs)
• src/OgreVisibilityTerrainSceneManager.cpp (modified) (7 diffs)

trunk/VUT/Ogre/include/OgreVisibilityTerrainSceneManager.h

@@ -72 +72 @@
         void renderQueueGroupObjects(RenderQueueGroup* pGroup);
 
-        /** Override from SceneManager so that sub entities can be assigned an id for item buffer */
+        /** Override from SceneManager so that sub entities can be assigned an id for item buffer.
+        */
         Entity* createEntity(const String& entityName, const String& meshName);
 
-        /** Returns pointer to visibility manager */
+        /** Returns pointer to visibility manager.
+        */
         GtpVisibility::VisibilityManager *GetVisibilityManager();
 
 protected:
         
-        /** Creates material for depth pass, e.g., a pass that only fills the depth buffer. */
+        /** Creates material for depth pass, e.g., a pass that only fills the depth buffer. 
+        */
         void InitDepthPass();
-        /** Creates material for item buffer. */
+        /** Creates material for item buffer. 
+        */
         void InitItemBufferPass();
-        /** Fills render queue so that a visualization can be rendered. */
+        /** Fills render queue so that a visualization can be rendered. 
+        */
         void ShowVisualization(Camera *cam);
 
@@ -100 +105 @@
         bool mRenderDepthPass;
         bool mRenderItemBuffer;
+        bool mEnableDepthWrite;
 
         Pass *mDepthPass;

trunk/VUT/Ogre/src/OgrePlatformHierarchyInterface.cpp

@@ -188 +188 @@
         else
         {
+                // used by the scene manager, because bounding box rendering must be handled
+                // differently
                 mIsBoundingBoxQuery = true;
 

trunk/VUT/Ogre/src/OgreVisibilitySceneManagerDll.cpp

@@ -46 +46 @@
 
 //-----------------------------------------------------------------------
-extern "C" void dllStartPlugin(void)
+extern "C" void __declspec(dllexport) dllStartPlugin(void)
 {
         visEnv = new GtpVisibility::VisibilityEnvironment();
@@ -66 +66 @@
 }
 //-----------------------------------------------------------------------
-extern "C" void dllStopPlugin()
+extern "C" void __declspec(dllexport) dllShutdownPlugin()
+{
+        visibilityTerrainPlugin->shutdown();
+        heightmapTerrainPageSource->shutdown();
+}
+//-----------------------------------------------------------------------
+extern "C" void __declspec(dllexport) dllStopPlugin()
 {
         delete heightmapTerrainPageSource;
@@ -77 +83 @@
         delete visEnv;
 }
-//-----------------------------------------------------------------------
-extern "C" void dllShutdownPlugin()
-{
-        visibilityTerrainPlugin->shutdown();
-        heightmapTerrainPageSource->shutdown();
-}
+
 
 } //namespace Ogre

trunk/VUT/Ogre/src/OgreVisibilityTerrainSceneManager.cpp

@@ -25 +25 @@
 mUseDepthPass(false),
 mRenderItemBuffer(false),
-mCurrentEntityId(0)
+mCurrentEntityId(0),
+mEnableDepthWrite(true)
 {
         mHierarchyInterface = new OctreeHierarchyInterface(this, mDestRenderSystem);
@@ -145 +146 @@
         
         // set depth fill pass only if depth write enabled
-        Pass *usedPass = (mRenderDepthPass && !mHierarchyInterface->IsBoundingBoxQuery() ? mDepthPass : pass);
+        Pass *usedPass = (mRenderDepthPass && !mHierarchyInterface->IsBoundingBoxQuery() ? 
+                                          mDepthPass : pass);
                 
         IlluminationRenderStage savedStage = mIlluminationStage; 
@@ -158 +160 @@
         if (mRenderDepthPass)
         {
-                // set vertex program of current pass
+                // --- set vertex program of current pass so z-buffer is updated correctly
         if (pass->hasVertexProgram())
                 {
@@ -178 +180 @@
                 }
         }
+
+        bool IsDepthWrite = usedPass->getDepthWriteEnabled();
+        // global option which enables / disables depth writes
+        if (!mEnableDepthWrite)
+        {
+                usedPass->setDepthWriteEnabled(false);
+        }
+
         //else if (mIsItemBufferPass) {usedPass = mItemBufferPass;}
         
         Pass *result = SceneManager::setPass(usedPass);
+
+        // reset depth write
+        if (!mEnableDepthWrite)
+        {
+                usedPass->setDepthWriteEnabled(IsDepthWrite);
+        }
 
         // reset illumination stage
@@ -191 +207 @@
 {
         // needs full ambient lighting for item colors to be exact
-        if (mRenderItemBuffer)
-        {
-                setAmbientLight(ColourValue(1,1,1,1));
-        }
-        //getRenderQueue()->clear();
-
+        /*if (mRenderItemBuffer)
+        {       setAmbientLight(ColourValue(1,1,1,1)); }*/
+        
         //-- show visible scene nodes and octree bounding boxes from last frame
         if (mShowVisualization)
@@ -374 +387 @@
         {
                 TerrainRenderable::setCurrentRenderLevelIndex((*static_cast<const int *>(val)));
+                return true;
+        }
+        if (key == "DepthCheck")
+        {
+                mEnableDepthWrite = (*static_cast<const bool *>(val));
                 return true;
         }
@@ -508 +526 @@
         }
 
-        // ----- TRANSPARENT LOOP: must be handlet differently altough we don't really
-        // care about transparents for the item buffer
+        // ----- TRANSPARENT LOOP: must be handled differently 
+        // although we don't really     care about transparents for the item buffer
         // TODO: HOW TO HANDLE OCCLUDED OBJECTS ????
         RenderPriorityGroup::TransparentRenderablePassList