Changeset 34 for trunk/VUT/OcclusionCullingSceneManager/src

Timestamp:

03/30/05 17:54:55 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/OcclusionCullingSceneManager/src

Files:

• OgreOcclusionCullingSceneManagerDll.cpp (modified) (4 diffs)
• OgreOcclusionCullingSceneTraverser.cpp (modified) (5 diffs)
• OgreOcclusionCullingTerrainSceneManager.cpp (modified) (3 diffs)

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingSceneManagerDll.cpp

@@ -27 +27 @@
 #include "OgreOcclusionCullingSceneManager.h"
 #include "OgreOcclusionCullingDotSceneManager.h"
+#include "OgreHeightmapTerrainPageSource.h"
 #include <OgreRoot.h>
 
-//#include "OgreHeightmapTerrainPageSource.h"
 //#include <windows.h>
 
@@ -36 +36 @@
     OcclusionCullingSceneManager *occlusionPlugin;
         OcclusionCullingTerrainSceneManager *occlusionTerrainPlugin;
-        
+        HeightmapTerrainPageSource* heightmapTerrainPageSource;
+
     //-----------------------------------------------------------------------
     extern "C" void dllStartPlugin(void)
@@ -43 +44 @@
                 occlusionPlugin = new OcclusionCullingSceneManager();
                 occlusionTerrainPlugin = new OcclusionCullingTerrainSceneManager();
-    
+                heightmapTerrainPageSource = new HeightmapTerrainPageSource();
+
+                occlusionTerrainPlugin->registerPageSource("Heightmap", heightmapTerrainPageSource);
+
             // Register
                 Root::getSingleton().setSceneManager( ST_GENERIC, occlusionPlugin );
@@ -52 +56 @@
     extern "C" void dllStopPlugin(void)
     {
+                delete heightmapTerrainPageSource;
         delete occlusionPlugin;
                 delete occlusionTerrainPlugin;

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingSceneTraverser.cpp

@@ -41 +41 @@
                 mDistanceQueue->push(root);
                 mCurrentTestIdx = 0;
-                
+
+                mCurrentAlgorithm = RENDER_CULL_FRUSTUM;
                 switch(mCurrentAlgorithm)
                 {
@@ -144 +145 @@
                         node->setNodeVisible(false);
                                 
-                        if(cam->isVisible(node->_getWorldAABB()))
+                        if(!cam->isVisible(node->_getWorldAABB()))
                         {
                                 // update node's visited flag 
@@ -151 +152 @@
                                 traverseNode(cam, node);
                         }
-                        else
+                        //else
+                                if(cam->isVisible(node->_getWorldAABB()))
+                                {
+                                        mNumQueryCulledNodes ++;
+                                }else
                         {                       
                                 mNumFrustumCulledNodes ++;
@@ -230 +235 @@
         {
                 mNumTraversedNodes ++;
-
+                
                 if(node->numAttachedObjects() > 0)
                 {
@@ -252 +257 @@
                 //HACK (too slow)
                 mSceneManager->_renderSceneNode(cam, node);
+                //MessageBox( NULL, "myplugin registered", "this is my plugin", MB_OK | MB_ICONERROR | MB_TASKMODAL);
         }
         //-----------------------------------------------------------------------

trunk/VUT/OcclusionCullingSceneManager/src/OgreOcclusionCullingTerrainSceneManager.cpp

@@ -15 +15 @@
         {
                 mOcclusionCullingSceneTraverser = new OcclusionCullingSceneTraverser(this, mDestRenderSystem);
+                mDisplayNodes = true;
+                //mShowBoundingBoxes = true;
+                mShowBoxes = true;
         }
         //-----------------------------------------------------------------------
@@ -22 +25 @@
         }
         //-----------------------------------------------------------------------
-        void OcclusionCullingTerrainSceneManager::_renderVisibleObjects(void)
+        /*void OcclusionCullingTerrainSceneManager::_renderVisibleObjects(void)
         {
                 mOcclusionCullingSceneTraverser->renderScene(mCameraInProgress, mSceneRoot);
@@ -38 +41 @@
 
                 TerrainSceneManager::_updateSceneGraph(cam);
-        }
+        }*/
         //-----------------------------------------------------------------------
         bool OcclusionCullingTerrainSceneManager::setOption( const String & key, const void * val )