Changeset 48 for trunk

Timestamp:

04/13/05 09:37:20 (20 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/OcclusionCullingSceneManager

Files:

• TestCullingDotScene/TestCullingDotScene.vcproj (modified) (1 diff)
• TestCullingTerrain/TestCullingTerrain.vcproj (modified) (2 diffs)
• TestCullingTerrain/TestCullingTerrainApplication.cpp (modified) (8 diffs)
• TestCullingTerrain/TestCullingTerrainApplication.h (modified) (2 diffs)
• include/OgreOcclusionCullingOctreeSceneManager.h (modified) (2 diffs)
• include/OgreOcclusionCullingTerrainSceneManager.h (modified) (1 diff)
• scripts/Plugin_OcclusionCullingSceneManager.suo (modified) (previous)
• src/OgreOcclusionCullingOctreeSceneTraverser.cpp (modified) (12 diffs)
• src/OgreOcclusionCullingSceneManagerDll.cpp (modified) (1 diff)
• src/OgreOcclusionCullingTerrainSceneManager.cpp (modified) (6 diffs)

trunk/VUT/OcclusionCullingSceneManager/TestCullingDotScene/TestCullingDotScene.vcproj

@@ -129 +129 @@
                 </Filter>
                 <Filter
-                        Name="Resource Files"
-                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-                </Filter>
-                <Filter
                         Name="tinyxml"
                         Filter="">

trunk/VUT/OcclusionCullingSceneManager/TestCullingTerrain/TestCullingTerrain.vcproj

@@ -122 +122 @@
                         UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
                         <File
+                                RelativePath=".\TerrainContentGenerator.cpp">
+                        </File>
+                        <File
                                 RelativePath=".\TestCullingTerrainApplication.cpp">
                         </File>
@@ -130 +133 @@
                         UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
                         <File
+                                RelativePath=".\TerrainContentGenerator.h">
+                        </File>
+                        <File
                                 RelativePath=".\TestCullingTerrainApplication.h">
                         </File>
-                </Filter>
-                <Filter
-                        Name="Resource Files"
-                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
                 </Filter>
         </Files>

trunk/VUT/OcclusionCullingSceneManager/TestCullingTerrain/TestCullingTerrainApplication.cpp

@@ -1 +1 @@
 /**
     \file 
-        TestCullingApplication.cpp
+        TestCullingTerrainApplication.cpp
     \brief
         Tests the occlusion culling algorithm
@@ -14 +14 @@
 
 #include "Ogre.h"
-#include "TestCullingApplication.h"
+#include "TestCullingTerrainApplication.h"
 #include "OgreOcclusionCullingSceneTraverser.h"
 
@@ -23 +23 @@
 
 /***********************************************/
-/* TestCullingApplication implementation       */
+/* TestCullingTerrainApplication implementation       */
 /***********************************************/
-/*TestCullingApplication::~TestCullingApplication()
+/*TestCullingTerrainApplication::~TestCullingTerrainApplication()
 {
         delete mRaySceneQuery;
 }*/
 //-----------------------------------------------------------------------
-void TestCullingApplication::createCamera( void )
+void TestCullingTerrainApplication::createCamera( void )
 {
         // Create the camera
@@ -44 +44 @@
 }
 //-----------------------------------------------------------------------
-void TestCullingApplication::createScene(void)
+void TestCullingTerrainApplication::createScene(void)
 {
         Plane waterPlane;
@@ -119 +119 @@
 }
 //-----------------------------------------------------------------------
-void TestCullingApplication::setupGui( void )
+void TestCullingTerrainApplication::setupGui( void )
 {
          mGUIRenderer = new CEGUI::OgreCEGUIRenderer(mWindow, Ogre::RENDER_QUEUE_OVERLAY, false, 3000, ST_EXTERIOR_CLOSE);
@@ -133 +133 @@
 }
 //-----------------------------------------------------------------------
-void TestCullingApplication::createFrameListener(void)
+void TestCullingTerrainApplication::createFrameListener(void)
 {
         mFrameListener= new MouseQueryListener(mWindow, mCamera, mSceneMgr, mGUIRenderer);
@@ -140 +140 @@
 }
 //-----------------------------------------------------------------------
-void TestCullingApplication::chooseSceneManager(void)
+void TestCullingTerrainApplication::chooseSceneManager(void)
 {
     //mSceneMgr = mRoot->getSceneManager(ST_GENERIC);
@@ -395 +395 @@
 {
     // Create application object
-    TestCullingApplication app;
+    TestCullingTerrainApplication app;
 
         try 

trunk/VUT/OcclusionCullingSceneManager/TestCullingTerrain/TestCullingTerrainApplication.h

@@ -1 +1 @@
 /**
     \file 
-        TestCullingApplication.h
+        TestCullingTerrainApplication.h
 */
 #include "CEGUIForwardRefs.h"
@@ -86 +86 @@
 
 
-class TestCullingApplication : public ExampleApplication
+class TestCullingTerrainApplication : public ExampleApplication
 {
 public:
-        //~TestCullingApplication();
+        //~TestCullingTerrainApplication();
 
 protected:

trunk/VUT/OcclusionCullingSceneManager/include/OgreOcclusionCullingOctreeSceneManager.h

@@ -1 @@
-#ifndef _OcclusionCullingTerrainSceneManager_H__
-#define _OcclusionCullingTerrainSceneManager_H__
+#ifndef _OcclusionCullingOctreeSceneManager_H__
+#define _OcclusionCullingOctreeSceneManager_H__
 
 #include <OgreSceneNode.h>
 #include <OgreOctreeSceneManager.h>
-#include <OgreTerrainSceneManager.h>
-#include <OgreOctreeSceneQuery.h>
 #include <OgreOctreeNode.h>
 #include <OgreOctreeCamera.h>
@@ -11 +9 @@
 #include "OgrePrerequisites.h"
 #include "OgreOcclusionCullingOctreeSceneTraverser.h"
-//#include "OgreSolidHalfBoundingBox.h"
 
 using namespace std;

trunk/VUT/OcclusionCullingSceneManager/include/OgreOcclusionCullingTerrainSceneManager.h

@@ -10 +10 @@
 
 #include "OgrePrerequisites.h"
-#include "OgreOcclusionCullinOctreeSceneTraverser.h"
-//#include "OgreSolidHalfBoundingBox.h"
+#include "OgreOcclusionCullingOctreeSceneTraverser.h"
 
 using namespace std;

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingOctreeSceneTraverser.cpp

@@ -1 +1 @@
 #include "OgreOcclusionCullingOctreeSceneTraverser.h"
-#include "OgreOcclusionCullingTerrainSceneManager.h"
+#include "OgreOcclusionCullingOctreeSceneManager.h"
 #include "OgreHardwareOcclusionQuery.h"
 
@@ -7 +7 @@
 namespace Ogre {
         //-----------------------------------------------------------------------
-        OcclusionCullingTerrainSceneTraverser::OcclusionCullingTerrainSceneTraverser(SceneManager *sm, RenderSystem *rsys): 
+        OcclusionCullingOctreeSceneTraverser::OcclusionCullingOctreeSceneTraverser(SceneManager *sm, RenderSystem *rsys): 
         OcclusionCullingSceneTraverser(sm, rsys), mOctreeSceneRoot(0), mOctreeDistanceQueue(0)
         {
         }
         //-----------------------------------------------------------------------
-        OcclusionCullingTerrainSceneTraverser::~OcclusionCullingTerrainSceneTraverser()
+        OcclusionCullingOctreeSceneTraverser::~OcclusionCullingOctreeSceneTraverser()
         {               
                 if(mOctreeDistanceQueue)
@@ -18 +18 @@
         }
         //-----------------------------------------------------------------------
-        void OcclusionCullingTerrainSceneTraverser::traverseOctant(Camera *cam, Octree *octant )
+        void OcclusionCullingOctreeSceneTraverser::traverseOctant(Camera *cam, Octree *octant )
         {
                 mNumTraversedNodes ++;
@@ -34 +34 @@
         }
         //-----------------------------------------------------------------------
-        void OcclusionCullingTerrainSceneTraverser::renderCullFrustum(Camera *cam)
+        void OcclusionCullingOctreeSceneTraverser::renderCullFrustum(Camera *cam)
         {
                 AxisAlignedBox box;
@@ -63 +63 @@
         //-----------------------------------------------------------------------
         /** Renders the scene with the hierarchical stop and wait algorithm. */
-        void OcclusionCullingTerrainSceneTraverser::renderStopAndWait( Camera *cam )
+        void OcclusionCullingOctreeSceneTraverser::renderStopAndWait( Camera *cam )
         {
                 AxisAlignedBox box;
@@ -114 +114 @@
         //-----------------------------------------------------------------------
         /** Renders the scene with the coherent hierarchical algorithm and the query queye. */
-        void OcclusionCullingTerrainSceneTraverser::renderCoherentWithQueue( Camera *cam )
+        void OcclusionCullingOctreeSceneTraverser::renderCoherentWithQueue( Camera *cam )
         {
                 OctreeQueryQueue queryQueue;
@@ -204 +204 @@
         }
         //-----------------------------------------------------------------------
-        void OcclusionCullingTerrainSceneTraverser::pullUpVisibility( Camera *cam, Octree *octant )
+        void OcclusionCullingOctreeSceneTraverser::pullUpVisibility( Camera *cam, Octree *octant )
         {
                 while(octant && !octant->isOctreeVisible())
@@ -216 +216 @@
         }
         //-----------------------------------------------------------------------
-        void OcclusionCullingTerrainSceneTraverser::renderOctant( Camera *cam, Octree *octant )
+        void OcclusionCullingOctreeSceneTraverser::renderOctant( Camera *cam, Octree *octant )
         {
                 //if(octant->numNodes() > 0)
@@ -224 +224 @@
 
                         octant->setLastRendered(octant->lastVisited());
-                        ((OcclusionCullingTerrainSceneManager *)mSceneManager)->_renderOctant(cam, octant);
+                        ((OcclusionCullingOctreeSceneManager *)mSceneManager)->_renderOctant(cam, octant);
                 }
                 else OutputDebugString("already rendered");
         }
         //-----------------------------------------------------------------------
-        void OcclusionCullingTerrainSceneTraverser::setSceneRoot(Octree *root)
+        void OcclusionCullingOctreeSceneTraverser::setSceneRoot(Octree *root)
         {
                 mOctreeSceneRoot = root;
         }
         //-----------------------------------------------------------------------
-        void OcclusionCullingTerrainSceneTraverser::initDistanceQueue(Camera *cam)
+        void OcclusionCullingOctreeSceneTraverser::initDistanceQueue(Camera *cam)
         {
                 if(mOctreeDistanceQueue)
@@ -243 +243 @@
         }
         //-----------------------------------------------------------------------
-        bool OcclusionCullingTerrainSceneTraverser::isLeaf(Octree *octant)
+        bool OcclusionCullingOctreeSceneTraverser::isLeaf(Octree *octant)
         {
                 for(int i=0; i<8; i++)
@@ -254 +254 @@
         }
         //-----------------------------------------------------------------------
-        void OcclusionCullingTerrainSceneTraverser::setNumOctreeNodes(unsigned int num)
+        void OcclusionCullingOctreeSceneTraverser::setNumOctreeNodes(unsigned int num)
         {
                 mNumOctreeNodes = num;
         }
         //-----------------------------------------------------------------------
-        bool OcclusionCullingTerrainSceneTraverser::getOption( const String & key, void *val )
+        bool OcclusionCullingOctreeSceneTraverser::getOption( const String & key, void *val )
         {
                 if ( key == "NumOctreeNodes" )
@@ -270 +270 @@
         }
         //-----------------------------------------------------------------------
-        bool OcclusionCullingTerrainSceneTraverser::getOptionKeys( StringVector & refKeys )
+        bool OcclusionCullingOctreeSceneTraverser::getOptionKeys( StringVector & refKeys )
         {
                 refKeys.push_back( "NumOctreeNodes" );

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingSceneManagerDll.cpp

@@ -25 +25 @@
 
 #include "OgreOcclusionCullingTerrainSceneManager.h"
-#include "OgreOcclusionCullingSceneManager.h"
-#include "OgreOcclusionCullingDotSceneManager.h"
+#include "OgreOcclusionCullingOctreeSceneManager.h"
+//#include "OgreOcclusionCullingDotSceneManager.h"
 #include "OgreHeightmapTerrainPageSource.h"
 #include <OgreRoot.h>

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingTerrainSceneManager.cpp

@@ -13 +13 @@
         OcclusionCullingTerrainSceneManager::OcclusionCullingTerrainSceneManager()
         {
-                mOcclusionCullingTerrainSceneTraverser = 
-                        new OcclusionCullingTerrainSceneTraverser(this, mDestRenderSystem);
+                mOcclusionCullingOctreeSceneTraverser = 
+                        new OcclusionCullingOctreeSceneTraverser(this, mDestRenderSystem);
 
                 //mDisplayNodes = true;
@@ -24 +24 @@
         OcclusionCullingTerrainSceneManager::~OcclusionCullingTerrainSceneManager()
         {
-                delete mOcclusionCullingTerrainSceneTraverser;
+                delete mOcclusionCullingOctreeSceneTraverser;
         }
         //-----------------------------------------------------------------------
@@ -43 +43 @@
                 setSpecialCaseRenderQueueMode(SceneManager::SCRQM_EXCLUDE);
 
-                mOcclusionCullingTerrainSceneTraverser->setSceneRoot(mOctree);
-                mOcclusionCullingTerrainSceneTraverser->renderScene(mCameraInProgress);
+                mOcclusionCullingOctreeSceneTraverser->setSceneRoot(mOctree);
+                mOcclusionCullingOctreeSceneTraverser->renderScene(mCameraInProgress);
                 
                 _deleteRenderedQueueGroups();
@@ -67 +67 @@
                 //mOcclusionCullingTerrainSceneTraverser->preprocess();
 
-        mOcclusionCullingTerrainSceneTraverser->setNumSceneNodes((int)mSceneNodes.size());
-                mOcclusionCullingTerrainSceneTraverser->setRenderSystem(mDestRenderSystem);
+        mOcclusionCullingOctreeSceneTraverser->setNumSceneNodes((int)mSceneNodes.size());
+                mOcclusionCullingOctreeSceneTraverser->setRenderSystem(mDestRenderSystem);
         
-                mOcclusionCullingTerrainSceneTraverser->setNumOctreeNodes(mNumOctreeNodes);
+                mOcclusionCullingOctreeSceneTraverser->setNumOctreeNodes(mNumOctreeNodes);
 
                 TerrainSceneManager::_updateSceneGraph(cam);
@@ -77 +77 @@
         bool OcclusionCullingTerrainSceneManager::setOption( const String & key, const void * val )
         {
-                return mOcclusionCullingTerrainSceneTraverser->setOption( key, val) || TerrainSceneManager::setOption( key, val );
+                return mOcclusionCullingOctreeSceneTraverser->setOption( key, val) || TerrainSceneManager::setOption( key, val );
         }
         //-----------------------------------------------------------------------
         bool OcclusionCullingTerrainSceneManager::getOption( const String & key, void *val )
         {
-                return mOcclusionCullingTerrainSceneTraverser->getOption( key, val) || TerrainSceneManager::getOption( key, val ) ;
+                return mOcclusionCullingOctreeSceneTraverser->getOption( key, val) || TerrainSceneManager::getOption( key, val ) ;
         }
         //-----------------------------------------------------------------------
@@ -92 +92 @@
         bool OcclusionCullingTerrainSceneManager::getOptionKeys( StringVector & refKeys )
         {
-                return mOcclusionCullingTerrainSceneTraverser->getOptionKeys ( refKeys ) || TerrainSceneManager::getOptionKeys( refKeys );
+                return mOcclusionCullingOctreeSceneTraverser->getOptionKeys ( refKeys ) || TerrainSceneManager::getOptionKeys( refKeys );
         }
         //-----------------------------------------------------------------------