Changeset 115 for trunk/VUT/work/ogre_changes/Plugins

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/Plugins/OctreeSceneManager

Files:

• include/OgreOctreeSceneManager.h (modified) (2 diffs)
• src/OgreOctree.cpp (modified) (2 diffs)
• src/OgreOctreeSceneManager.cpp (modified) (5 diffs)

trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/include/OgreOctreeSceneManager.h

@@ -105 +105 @@
         /** Renders one octant of an octree, i.e., renders current octant
                 node and does not traverse deeper into the tree.
+
                 @remark Note that OctreeNode instances are NOT part of the octree 
                 hierarchy, instead one octant of an Octree contains many OctreeNode instances.
-                @param octree the octree to be rendered
+                
                 @param cam current camera
+                @param octree the octant to be rendered (without children)
+                @param onlyShadowCasters if only shadow casters are rendered
+                @param leaveTransparentsInQueue if transparemt should be left in queue for later processing
         */
-        void _renderOctant(Camera* cam, Octree *octree, bool onlyShadowCasters);
+        void _renderOctant(Camera* cam, Octree *octree, bool onlyShadowCasters, bool leaveTransparentsInQueue = false);
 
         /** Returns stored list of boxes */
@@ -214 +218 @@
     IntersectionSceneQuery* createIntersectionQuery(unsigned long mask);
 
+
 protected:
 

trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/src/OgreOctree.cpp

@@ -109 +109 @@
                 mDepth = 0;
 
-        //matt: remove later
-        //char msg[100];
-        //sprintf(msg, "creating new octant in depth %d", mDepth);
-        //OutputDebugString(msg);
-
 #endif //GTP_VISIBILITY_MODIFIED_OGRE
     mNumNodes = 0;
@@ -171 +166 @@
 
         mWireBoundingBox->setupBoundingBox(mBox);
-
-        // matt: change this back
-        //AxisAlignedBox box; _getCullBounds(&box); 
-        //mWireBoundingBox->setupBoundingBox(box);
-
     return mWireBoundingBox;
 }

trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/src/OgreOctreeSceneManager.cpp

@@ -39 +39 @@
 #include <OgreOctreeCamera.h>
 #include <OgreRenderSystem.h>
-#include <windows.h>
+
 
 extern "C"
@@ -508 +508 @@
         }
 
-                //matt: remove later
-                //OutputDebugString("adding octree node\n");
-                
-
         _addOctreeNode( n, octant -> mChildren[ x ][ y ][ z ], ++depth );
 
@@ -1173 +1169 @@
 }
 //-----------------------------------------------------------------------
-void OctreeSceneManager::_renderOctant(Camera *cam, Octree *octant, bool onlyShadowCasters)
+void OctreeSceneManager::_renderOctant(Camera *cam, Octree *octant, bool onlyShadowCasters, 
+                                                                           bool leaveTransparentsInQueue)//, bool useZPassQueue)
 {
         //Add stuff to be rendered;
@@ -1188 +1185 @@
                 {
                         sn->_addToRenderQueue(cam, getRenderQueue(), onlyShadowCasters);
-                        //node->_findVisibleObjects(cam, getRenderQueue(), false, mDisplayNodes, false);
                         mVisible.push_back(sn);
 
@@ -1207 +1203 @@
         if (mShowBoxes)
         {
+                octant->getWireBoundingBox()->setMaterial("BaseWhiteNoLighting");
+
                 getRenderQueue()->addRenderable(octant->getWireBoundingBox());
                 mBoxes.push_back(octant->getWireBoundingBox());
         }
 
+        //-- the actual rendering
         SceneManager::_renderVisibleObjects();
-
         // delete all rendered objects from the render queue
-        _deleteRenderedQueueGroups();
+        _deleteRenderedQueueGroups(leaveTransparentsInQueue);
 }
 #endif // GTP_VISIBILITY_MODIFIED_OGRE