Changeset 96 for trunk/VUT/Ogre

Timestamp:

05/13/05 08:23:30 (20 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/Ogre/src

Files:

• OgrePlatformOcclusionQuery.cpp (modified) (1 diff)
• OgreVisibilityOctreeSceneManager.cpp (modified) (2 diffs)
• OgreVisibilitySceneManager.cpp (modified) (1 diff)
• OgreVisibilityTerrainSceneManager.cpp (modified) (2 diffs)

trunk/VUT/Ogre/src/OgrePlatformOcclusionQuery.cpp

@@ -1 +1 @@
 #include "OgrePlatformOcclusionQuery.h"
-#include <windows.h>
+
 namespace Ogre {
 

trunk/VUT/Ogre/src/OgreVisibilityOctreeSceneManager.cpp

@@ -21 +21 @@
         //mShowBoxes = true;
 
-        mMaxDepth = 20;
+        // TODO: find reasonable value for max depth
+        mMaxDepth = 50;
 }
 //-----------------------------------------------------------------------
@@ -31 +32 @@
 void VisibilityOctreeSceneManager::_renderVisibleObjects()
 {
-        Camera *cullCam = NULL;
-
-        if(mCullCamera) cullCam = getCamera("CullCamera");
-        
-        mHierarchyInterface->InitFrame(mOctree, mCameraInProgress, cullCam);
+        // two cameras (one for culling, one for rendering)
+        mHierarchyInterface->InitFrame(mOctree, mCameraInProgress, 
+                                                        mCullCamera ? getCamera("CullCamera") : NULL);
         mVisibilityManager->GetCullingManager()->InitFrame();
 
+        // standard scenemanager rendering without hierarchical culling
         if(!mUseCulling)
         {       

trunk/VUT/Ogre/src/OgreVisibilitySceneManager.cpp

@@ -9 +9 @@
 
 namespace Ogre {
-//namespace GtpVisibility {
+
 //-----------------------------------------------------------------------
 VisibilitySceneManager::VisibilitySceneManager(GtpVisibility::VisibilityManager *visManager)

trunk/VUT/Ogre/src/OgreVisibilityTerrainSceneManager.cpp

@@ -22 +22 @@
         //mDisplayNodes = true;
         //mShowBoundingBoxes = true;
-        mMaxDepth = 20;
+        mMaxDepth = 50;
 }
 //-----------------------------------------------------------------------
@@ -32 +32 @@
 void VisibilityTerrainSceneManager::_renderVisibleObjects()
 {
-        Camera *cullCam = NULL;
-
-        // if two cameras (one for culling, one for visualization)
-        if(mCullCamera)
-                cullCam = getCamera("CullCamera");
+        // two cameras (one for culling, one for rendering)
+        mHierarchyInterface->InitFrame(mOctree, mCameraInProgress, 
+                                                        mCullCamera ? getCamera("CullCamera") : NULL);
+        mVisibilityManager->GetCullingManager()->InitFrame();
         
-        if(cullCam && (mCameraInProgress != cullCam))
-                OutputDebugString("using cullcam\n");
-        else
-                OutputDebugString("not using cullcam\n");
-
-        mHierarchyInterface->InitFrame(mOctree, mCameraInProgress, cullCam);
-        mVisibilityManager->GetCullingManager()->InitFrame();
-
+        // standard scenemanager rendering without hierarchical culling
         if(!mUseCulling)
         {