Changeset 112 for trunk/VUT/work

Timestamp:

05/25/05 18:28:46 (20 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/work

Files:

• TestCulling/TestCullingApplication.cpp (modified) (2 diffs)
• TestCulling/TestCullingApplication.h (modified) (1 diff)
• TestCullingTerrain/TestCullingTerrainApplication.cpp (modified) (10 diffs)
• TestCullingTerrain/TestCullingTerrainApplication.h (modified) (1 diff)
• ogre_changes/Plugins/OctreeSceneManager/include/OgreOctreeSceneManager.h (modified) (1 diff)
• ogre_changes/Plugins/OctreeSceneManager/src/OgreOctreeSceneManager.cpp (modified) (1 diff)

trunk/VUT/work/TestCulling/TestCullingApplication.cpp

@@ -113 +113 @@
 mUseVisibilityCulling(true),
 mUseOptimization(true),
-mShowVisualization(false)
+mShowVisualization(false),
+mVisualizeCulledNodes(false)
 {
     // Reduce move speed
@@ -293 +294 @@
 
         mSceneMgr->setOption("ShowVisualization", &mShowVisualization);
+        mSceneMgr->setOption("VisualizeCulledNodes", &mVisualizeCulledNodes);
 }
 //-----------------------------------------------------------------------

trunk/VUT/work/TestCulling/TestCullingApplication.h

@@ -97 +97 @@
         bool mShowVisualization;
 
+        bool mVisualizeCulledNodes;
+
         Camera *mVizCamera;
 };

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.cpp

@@ -93 +93 @@
         // Set ambient light
         //mSceneMgr->setAmbientLight(ColourValue(0.5, 0.5, 0.5));
-        mSceneMgr->setAmbientLight(ColourValue(0.0, 0.0, 0.0));
+        mSceneMgr->setAmbientLight(ColourValue(0.5, 0.5, 0.5));
 
         //-- create light
@@ -99 +99 @@
         mSunLight->setType(Light::LT_DIRECTIONAL);
         //mSunLight->setType(Light::LT_SPOTLIGHT);
+        //mSunLight->setSpotlightRange(Degree(30), Degree(50));
+
     mSunLight->setPosition(707, 2000, 500);
         mSunLight->setCastShadows(true);
 
-        //mSunLight->setSpotlightRange(Degree(30), Degree(50));
-
-    Vector3 dir(0.5, 0.1, 0.5);
+        Vector3 dir(0.5, 0.5, 0.5);
         dir.normalise();
-        mSunLight->setDirection(Vector3::NEGATIVE_UNIT_Y);
+        mSunLight->setDirection(dir);
+        //mSunLight->setDirection(Vector3::NEGATIVE_UNIT_Y);
 
         mSunLight->setDiffuseColour(1, 1, 1);
@@ -130 +131 @@
         setupGui();
 
-        //mSceneMgr->setShadowTechnique(SHADOWTYPE_NONE);
-
         // Floor plane
-        Plane plane;
+        /*Plane plane;
         plane.normal = Vector3::UNIT_Y;
         plane.d = -60;
@@ -142 +141 @@
         pPlaneEnt->setMaterialName("Examples/Rockwall");
         pPlaneEnt->setCastShadows(true);
-        mSceneMgr->getRootSceneNode()->createChildSceneNode()->attachObject(pPlaneEnt);
+        mSceneMgr->getRootSceneNode()->createChildSceneNode()->attachObject(pPlaneEnt);*/
 
         if (mRoot->getRenderSystem()->getCapabilities()->hasCapability(RSC_HWRENDER_TO_TEXTURE))
@@ -154 +153 @@
                 mSceneMgr->setShadowTextureSettings(512, 2);
         }
-        mSceneMgr->setShadowColour(ColourValue(0, 0, 0));
- // mSceneMgr->setShowDebugShadows(true);
+        //mSceneMgr->setShadowColour(ColourValue(0, 0, 0));
+        mSceneMgr->setShadowColour(ColourValue(0.5, 0.5, 0.5));
+    // mSceneMgr->setShowDebugShadows(true);
 
 
@@ -175 +175 @@
 
                 // the objects are generated on the whole terrain
-                mTerrainContentGenerator->GenerateScene(1500, "athene");
-                //mTerrainContentGenerator->GenerateScene(1500, "robot");
+                //mTerrainContentGenerator->GenerateScene(1500, "athene");
+                mTerrainContentGenerator->GenerateScene(1500, "robot");
                 //      mTerrainContentGenerator->GenerateScene(500, "ninja");
         }
@@ -245 +245 @@
 mRecord(false),
 mTimeElapsed(0),
-mUseShadows(false)
+mUseShadows(false),
+mVisualizeCulledNodes(false)
 {
         // Reduce move speed
@@ -704 +705 @@
 {
         mShowVisualization = !mShowVisualization;
+        mVisualizeCulledNodes = !mVisualizeCulledNodes;
 
         // create viewport with priority VIZ_VIEWPORT_Z_ORDER: 
@@ -718 +720 @@
         mVizCamera->setAspectRatio(Real(vizvp->getActualWidth()) / 
                         Real(vizvp->getActualHeight()));
+                
+                mSceneMgr->setOption("VisualizeCulledNodes", &mVisualizeCulledNodes);
                 //vizvp->setClearEveryFrame(false);
 
@@ -732 +736 @@
         {
                 mWindow->removeViewport(VIZ_VIEWPORT_Z_ORDER);
-                // if octree was enabled for visualization purpose
+                // if octree was enabled for visualization purpose, reset now
                 mSceneMgr->setOption("ShowOctree", &mShowOctree);
         }

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.h

@@ -165 +165 @@
         Real mTimeElapsed;
         bool mUseShadows;
+
+        bool mVisualizeCulledNodes;
 };
 

trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/include/OgreOctreeSceneManager.h

@@ -111 +111 @@
         */
         void _renderOctant(Camera* cam, Octree *octree, bool onlyShadowCasters);
+
+        /** Returns stored list of boxes */
+        BoxList *getBoxes();
 #endif // GTP_VISIBILITY_MODIFIED_OGRE
 

trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/src/OgreOctreeSceneManager.cpp

@@ -1167 +1167 @@
 }
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
+//-----------------------------------------------------------------------       
+BoxList *OctreeSceneManager::getBoxes()
+{
+        return &mBoxes;
+}
 //-----------------------------------------------------------------------
 void OctreeSceneManager::_renderOctant(Camera *cam, Octree *octant, bool onlyShadowCasters)