Changeset 139 for trunk/VUT/work/TestCullingTerrain

Timestamp:

06/20/05 08:13:57 (20 years ago)

Author:

mattausch

Message:

fixed bug with tight octree boxes
added more flexible renderqueue (can delete per flag)
reordered functions in visibility terrain scene manager

Location:

trunk/VUT/work/TestCullingTerrain

Files:

• TerrainFrameListener.cpp (modified) (8 diffs)
• TerrainFrameListener.h (modified) (2 diffs)
• TestCullingTerrainApplication.cpp (modified) (5 diffs)
• TestCullingTerrainApplication.h (modified) (3 diffs)

trunk/VUT/work/TestCullingTerrain/TerrainFrameListener.cpp

@@ -75 +75 @@
 mCullCamera(false),
 mRecord(false),
-mUseShadows(false),
+mShowShadows(false),
 mShowHelp(false),
 mDisplayCameraDetails(false),
@@ -159 +159 @@
         mSceneMgr->setOption("ShowOctree", &mShowOctree);
         mSceneMgr->setOption("CullCamera", &mCullCamera);
-        mSceneMgr->setOption("ShowVisualization", &mShowVisualization);
+        mSceneMgr->setOption("PrepareVisualization", &mShowVisualization);
 
         // TODO: change this (does not work with other scene manager plugins)
@@ -257 +257 @@
         }
 
-//      mInputDevice->capture();
+        if (mDisplayCameraDetails)
+    {
+        // Print camera details
+        mWindow->setDebugText("P: " + StringConverter::toString(mCamera->getDerivedPosition()) + 
+                        " " + "O: " + StringConverter::toString(mCamera->getDerivedOrientation()));
+    }
 
         //-- IMPORTANT: must be set, otherwise terrain is not rendered correctly
@@ -706 +711 @@
 void TerrainFrameListener::toggleShowViz()
 {
-        mShowVisualization = !mShowVisualization;
-        mVisualizeCulledNodes = !mVisualizeCulledNodes;
-
+        mVisualizeCulledNodes = mShowVisualization = !mShowVisualization;
+        
         // create viewport with priority VIZ_VIEWPORT_Z_ORDER: 
         // will be rendered over standard viewport
@@ -721 +725 @@
                 // Alter the camera aspect ratio to match the viewport
         mVizCamera->setAspectRatio(Real(vizvp->getActualWidth()) / 
-                        Real(vizvp->getActualHeight()));
+                                                                   Real(vizvp->getActualHeight()));
                 
                 mSceneMgr->setOption("VisualizeCulledNodes", &mVisualizeCulledNodes);
@@ -733 +737 @@
                 mSceneMgr->setSkyPlane(true, plane, "Examples/TransparentTest", 4000, 75, false);
                 */
-                
         }
         else
         {
+                // remove visualization viewport
                 mWindow->removeViewport(VIZ_VIEWPORT_Z_ORDER);
-                // if octree was enabled for visualization purpose, reset now
+
+                // octree bounding boxes are shown for visualization purpose, reset now
                 mSceneMgr->setOption("ShowOctree", &mShowOctree);
         }
 }
 //-----------------------------------------------------------------------
-void TerrainFrameListener::toggleUseShadows()
-{
-        mUseShadows = !mUseShadows;
-
-        mSunLight->setCastShadows(mUseShadows);
-
-        if (mUseShadows)
+void TerrainFrameListener::toggleShowShadows()
+{
+        mShowShadows = !mShowShadows;
+
+        mSunLight->setCastShadows(mShowShadows);
+
+        if (mShowShadows)
         {
                 mSceneMgr->setShadowTechnique(SHADOWTYPE_TEXTURE_MODULATIVE);
+                //mSceneMgr->setShadowTechnique(SHADOWTYPE_STENCIL_MODULATIVE);
+                //mSceneMgr->setShadowTechnique(SHADOWTYPE_STENCIL_ADDITIVE);           
         }
         else
@@ -805 +812 @@
                 break;
         case KC_S:
-                toggleUseShadows();
+                toggleShowShadows();
                 break;
 
@@ -857 +864 @@
                 break;
         }
-
-        if (mDisplayCameraDetails)
-    {
-        // Print camera details
-        mWindow->setDebugText("P: " + StringConverter::toString(mCamera->getDerivedPosition()) + 
-                        " " + "O: " + StringConverter::toString(mCamera->getDerivedOrientation()));
-    }
 
         CEGUI::System::getSingleton().injectKeyDown(e->getKey());

trunk/VUT/work/TestCullingTerrain/TerrainFrameListener.h

@@ -98 +98 @@
         void toggleShowStats();
 
-        void toggleUseShadows();
+        void toggleShowShadows();
         void toggleDisplayCameraDetails();
         void takeScreenShot();
@@ -175 +175 @@
         bool mCullCamera;
         bool mRecord;
-        bool mUseShadows;
+        bool mShowShadows;
         bool mVisualizeCulledNodes;
         bool mShowHelp;

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.cpp

@@ -84 +84 @@
 {
         // Set ambient light
-        mSceneMgr->setAmbientLight(ColourValue(0.5, 0.5, 0.5));
+        mAmbientLight = ColourValue(0.5, 0.5, 0.5);
+        mSceneMgr->setAmbientLight(mAmbientLight);
         
         //-- create light
@@ -100 +101 @@
         mSunLight->setDirection(dir);
         //mSunLight->setDirection(Vector3::NEGATIVE_UNIT_Y);
-
         mSunLight->setDiffuseColour(1, 1, 1);
         mSunLight->setSpecularColour(1, 1, 1);
@@ -137 +137 @@
         */
         mSceneMgr->setShadowTextureSettings(1024, 2);
-/*      if (mRoot->getRenderSystem()->getCapabilities()->hasCapability(RSC_HWRENDER_TO_TEXTURE))
-    {   // In D3D, use a 1024x1024 shadow texture
-                mSceneMgr->setShadowTextureSettings(1024, 2);   }       else    {
-                // Use 512x512 texture in GL since we can't go higher than the window res
-                mSceneMgr->setShadowTextureSettings(512, 2);}
-                */
-
-        //mSceneMgr->setShadowColour(ColourValue(0, 0, 0));
         mSceneMgr->setShadowColour(ColourValue(0.5, 0.5, 0.5));
-    // mSceneMgr->setShowDebugShadows(true);
+    //mSceneMgr->setShowDebugShadows(true);
 
 
@@ -220 +212 @@
         const bool nShowViz = !showViz;
 
-        // ambient light must be full for visualization
+        mSavedShadowTechnique = mSceneMgr->getShadowTechnique();
+        mSavedAmbientLight = mSceneMgr->getAmbientLight();
+
+        // -- ambient light must be full for visualization, shadows disabled
     if (showViz)
         {
                 mSceneMgr->setAmbientLight(ColourValue(1, 1, 1));
-        }
-        else
-        {
-                mSceneMgr->setAmbientLight(ColourValue(0.5, 0.5, 0.5));
-        }
-
-    mSceneMgr->setOption("ShowVisualization", &showViz);
+                mSceneMgr->setShadowTechnique(SHADOWTYPE_NONE);
+        }
+        
+    mSceneMgr->setOption("PrepareVisualization", &showViz);
         mSceneMgr->setOption("SkyBoxEnabled", &nShowViz);
         //mSceneMgr->setOption("SkyPlaneEnabled", &showViz);
@@ -239 +231 @@
 void VisualizationRenderTargetListener::postRenderTargetUpdate(const RenderTargetEvent &evt)
 {
+        // reset values
+        mSceneMgr->setShadowTechnique(mSavedShadowTechnique);
+        mSceneMgr->setAmbientLight(mSavedAmbientLight);
+        
         RenderTargetListener::postRenderTargetUpdate(evt);
 }

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.h

@@ -3 +3 @@
 
 #include "CEGUIForwardRefs.h"
+#include <OgreRenderTargetListener.h>
 #include "ExampleApplication.h"
+
 #include "OgreTerrainContentGenerator.h"
-
-#include <OgreRenderTargetListener.h>
 #include "TerrainFrameListener.h"
 
@@ -19 +19 @@
 
         SceneManager *mSceneMgr;
+        
+        ShadowTechnique mSavedShadowTechnique;
+        ColourValue mSavedAmbientLight;
 };
 
@@ -54 +57 @@
         SceneNode *mCamNode;
         Light *mSunLight;
-        VisualizationRenderTargetListener *mRenderTargetListener;
 
         TerrainFrameListener *mTerrainFrameListener;
+        ColourValue mAmbientLight;
+        //VisualizationRenderTargetListener *mVizRenderTargetListener;
         
 private: