Changeset 147 for trunk/VUT/Ogre

Timestamp:

06/22/05 18:35:55 (19 years ago)

Author:

mattausch

Message:

fixed average fps + shadow maps

Location:

trunk/VUT/Ogre

Files:

• resources/VisibilityDemo.overlay (modified) (5 diffs)
• src/OgreVisibilityTerrainSceneManager.cpp (modified) (3 diffs)

trunk/VUT/Ogre/resources/VisibilityDemo.overlay

@@ -46 +46 @@
                 element TextArea(Example/Visibility/AlgorithmInfo): Example/Visibility/Templates/BasicText
                 {
-                        left 155
+                        left 170
                         top 5
                         width 90
@@ -63 +63 @@
                 element TextArea(Example/Visibility/ThresholdInfo): Example/Visibility/Templates/BasicText
                 {
-                        left 155
+                        left 170
                         top 20
                         width 90
@@ -79 +79 @@
                 element TextArea(Example/Visibility/UseOptimizationInfo): Example/Visibility/Templates/BasicText
                 {
-                        left 155
+                        left 170
                         top 35
                         width 90
@@ -95 +95 @@
                 element TextArea(Example/Visibility/UseDepthPassInfo): Example/Visibility/Templates/BasicText
                 {
-                        left 155
+                        left 170
                         top 50
                         width 90
@@ -107 +107 @@
                         width 90
                         height 30
-                        caption [A] Assumed Visibility
+                        caption [8][9] Assumed Visibility
                 }
                 
                 element TextArea(Example/Visibility/AssumedVisibilityInfo): Example/Visibility/Templates/BasicText
                 {
-                        left 155
+                        left 170
                         top 65
                         width 90

trunk/VUT/Ogre/src/OgreVisibilityTerrainSceneManager.cpp

@@ -223 +223 @@
         else
         {       
-                // we interleave identification and rendering of objects 
-                // in _renderVisibibleObjects
-
+                // if not the shadow pass we interleave identification 
+                // and rendering of objects in _renderVisibibleObjects
+                if (mShadowTechnique == SHADOWTYPE_TEXTURE_MODULATIVE && 
+                        mIlluminationStage == IRS_RENDER_TO_TEXTURE)
+                {
+                        TerrainSceneManager::_findVisibleObjects(cam, onlyShadowCasters);
+                }
                 // only shadow casters will be rendered in shadow texture pass
-                mHierarchyInterface->SetOnlyShadowCasters(onlyShadowCasters);
-                //InitVisibilityCulling(cam);
+                //mHierarchyInterface->SetOnlyShadowCasters(onlyShadowCasters);
         }
         //TerrainSceneManager::_findVisibleObjects(cam, onlyShadowCasters);
@@ -247 +250 @@
                 mIlluminationStage = IRS_NONE;
         
+                TerrainSceneManager::_renderVisibleObjects();
+
+                mIlluminationStage = savedStage;
+        }
+        // normal rendering for shadow maps because of performance
+        else if (mShadowTechnique == SHADOWTYPE_TEXTURE_MODULATIVE && 
+                         mIlluminationStage == IRS_RENDER_TO_TEXTURE)
+        {
                 TerrainSceneManager::_renderVisibleObjects();
         }
@@ -313 +324 @@
                 
         // set the new render level index afterwards => new level in the next frame 
-        TerrainRenderable::setCurrentRenderLevelIndex(
-                (TerrainRenderable::getCurrentRenderLevelIndex() + 1) % 10);
+        int levelIdx = (TerrainRenderable::getCurrentRenderLevelIndex() + 1) % 10;
+        TerrainRenderable::setCurrentRenderLevelIndex(levelIdx);
 
         getRenderQueue()->clear();