Changeset 115 for trunk/VUT/work/ogre_changes/OgreMain/src

Timestamp:

05/30/05 03:20:23 (19 years ago)

Author:

mattausch

Message:

added depth pass algorithm + delayed transparent object rendering (so depth ordering is right)

Location:

trunk/VUT/work/ogre_changes/OgreMain/src

Files:

• OgreRenderQueueSortingGrouping.cpp (added)
• OgreSceneManager.cpp (modified) (14 diffs)

trunk/VUT/work/ogre_changes/OgreMain/src/OgreSceneManager.cpp

@@ -59 +59 @@
 #include "OgreDataStream.h"
 #include "OgreStaticGeometry.h"
-#include <windows.h> //matt: remove later
+
 // This class implements the most basic scene manager
 
@@ -665 +665 @@
         if (lastUsedVertexProgram)
         {
-                        //matt: remove later
-                        //OutputDebugString("unbinding vertex program\n");
-
             mDestRenderSystem->unbindGpuProgram(GPT_VERTEX_PROGRAM);
             lastUsedVertexProgram = false;
@@ -990 +987 @@
                                const String& groupName)
 {
-    mSkyPlaneEnabled = enable;
     if (enable)
     {
@@ -1061 +1057 @@
 
     }
+        mSkyPlaneEnabled = enable;
 }
 //-----------------------------------------------------------------------
@@ -1071 +1068 @@
                              const String& groupName)
 {
-    mSkyBoxEnabled = enable;
     if (enable)
     {
@@ -1143 +1139 @@
 
     }
-
+        mSkyBoxEnabled = enable;
 }
 //-----------------------------------------------------------------------
@@ -1157 +1153 @@
                               const String& groupName)
 {
-    mSkyDomeEnabled = enable;
     if (enable)
     {
@@ -1164 +1159 @@
         {
             OGRE_EXCEPT(Exception::ERR_INVALIDPARAMS, 
-                "Sky dome material '" + materialName + " not found.",
+                "Sky dome material '" + materialName + "' not found.",
                 "SceneManager::setSkyDome");
         }
@@ -1208 +1203 @@
 
     }
+        mSkyDomeEnabled = enable;
 }
 //-----------------------------------------------------------------------
@@ -2658 +2654 @@
     {
         Light* l = i->second;
+                if (l->isVisible())
+                {
         if (l->getType() == Light::LT_DIRECTIONAL)
         {
@@ -2675 +2673 @@
 
         }
+    }
     }
 
@@ -4180 +4179 @@
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
 //-----------------------------------------------------------------------
-void SceneManager::_renderSceneNode( Camera *cam, SceneNode *node )
+void SceneManager::_renderSceneNode(Camera *cam, SceneNode *node, bool leaveTransparentsInQueue)
 {
         node->_findVisibleObjects(cam, getRenderQueue(), false, mDisplayNodes, false);
@@ -4186 +4185 @@
         
         // delete all rendered objects from renderqueue
-        _deleteRenderedQueueGroups();
-}
-//-----------------------------------------------------------------------
-void SceneManager::_deleteRenderedQueueGroups()
+        _deleteRenderedQueueGroups(leaveTransparentsInQueue);
+}
+//-----------------------------------------------------------------------
+void SceneManager::_deleteRenderedQueueGroups(bool leaveTransparentsInQueue)
 {
         RenderQueue::QueueGroupIterator queueIt = getRenderQueue()->_getQueueGroupIterator();
@@ -4200 +4199 @@
 
                 if (isRenderQueueToBeProcessed(qId))
+                {
+                        if (leaveTransparentsInQueue)
+                        {
+                                pGroup->clearSolids();
+                        }
+                        else
+                        {
                         pGroup->clear();
+        }
+                }
         }