Changeset 1185 for GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src

Timestamp:

08/07/06 16:12:39 (19 years ago)

Author:

szydlowski

Message:

 

File:

• GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreKdTreeSceneManager.cpp (modified) (7 diffs)

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreKdTreeSceneManager.cpp

@@ -41 +41 @@
 mLeavePassesInQueue(0),
 mDelayRenderTransparents(true),
-mUseDepthPass(false),
+mUseDepthPass(true),
 mIsDepthPassPhase(false),
 mUseItemBuffer(false),
@@ -589 +589 @@
                 }
         }
+
+        mVisibleNodes.clear();
 }
 
@@ -695 +697 @@
                         if (mUseDepthPass)
                         {
-                                //NodeList::const_iterator it, it_end = mVisible.end();
-
-                                ////getRenderQueue()->clear();
-                                //for (it = mVisible.begin(); it != it_end; ++ it)
-                                //{
-                                //      (*it)->_addToRenderQueue(mCameraInProgress, getRenderQueue(), false);
-                                //}
+                                KdRenderableList::const_iterator it, it_end = mVisibleNodes.end();
+
+                                //getRenderQueue()->clear();
+                                for (it = mVisibleNodes.begin(); it != it_end; ++ it)
+                                {
+                                        (*it)->queueObjects(mCameraInProgress, getRenderQueue(), false);
+                                }
                         }
 #endif  
@@ -722 +724 @@
 }
 
-// TODO: looks too easy, verify if it works 
 void KdTreeSceneManager::_renderNodes(const KdRenderableList& nodelist, Camera * cam, 
         bool onlyShadowCasters, int leavePassesInQueue)
 {
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
-        _deleteRenderedQueueGroups(leavePassesInQueue); //try avoiding modified ogre code
+        RenderQueueGroup *currentGroup = 
+                getRenderQueue()->getQueueGroup(getRenderQueue()->getDefaultQueueGroup());
+        currentGroup->clear(leavePassesInQueue);
 #else
         getRenderQueue()->clear();
@@ -737 +740 @@
                 if (!(*it)->isQueued(mHierarchyInterface->GetFrameId(), cam))
                 {
+                        mVisibleNodes.push_back(*it);
                         (*it)->queueObjects(cam, getRenderQueue(), onlyShadowCasters);
                 }
@@ -742 +746 @@
         }
 
-        SceneManager::_renderVisibleObjects();
-
+        _renderQueueGroupObjects(currentGroup, QueuedRenderableCollection::OM_PASS_GROUP);
 }
 //-----------------------------------------------------------------------
@@ -946 +949 @@
                 //}
 
-                if (mRenderNodesForViz || mRenderNodesContentForViz)
-                {
-                        // HACK: change node material so it is better suited for visualization
-                        MaterialPtr nodeMat = MaterialManager::getSingleton().getByName("Core/NodeMaterial");
-                        nodeMat->setAmbient(1, 1, 0);
-                        nodeMat->setLightingEnabled(true);
-                        nodeMat->getTechnique(0)->getPass(0)->removeAllTextureUnitStates();
-
-                        //for (NodeList::iterator it = mVisible.begin(); it != mVisible.end(); ++it)
-                        //{
-                        //      if (mRenderNodesForViz)
-                        //      {
-                        //              // render the leaf nodes
-                        //              if ((*it)->numAttachedObjects() && 
-                        //                      !(*it)->numChildren() && 
-                        //                      ((*it)->getAttachedObject(0)->getMovableType() == "Entity") &&
-                        //                      (*it)->getAttachedObject(0)->isVisible())
-                        //              {
-                        //                      getRenderQueue()->addRenderable((*it));
-                        //              }
-
-                        //              // addbounding boxes instead of node itself
-                        //              //(*it)->_addBoundingBoxToQueue(getRenderQueue());
-                        //      }
-                        //      // add renderables itself
-                        //      if (mRenderNodesContentForViz) 
-                        //      {
-                        //              (*it)->_addToRenderQueue(cam, getRenderQueue(), false);
-                        //      }
-                        //}
-                }       
+        if (mRenderNodesForViz || mRenderNodesContentForViz)
+        {
+                // HACK: change node material so it is better suited for visualization
+                MaterialPtr nodeMat = MaterialManager::getSingleton().getByName("Core/NodeMaterial");
+                nodeMat->setAmbient(1, 1, 0);
+                nodeMat->setLightingEnabled(true);
+                nodeMat->getTechnique(0)->getPass(0)->removeAllTextureUnitStates();
+
+                for (KdRenderableList::iterator it = mVisibleNodes.begin(); it != mVisibleNodes.end(); ++it)
+                {
+                        if (mRenderNodesForViz)
+                        {
+                                KdTreeSceneNode * node = static_cast<KdTreeSceneNode *>(*it);
+                                // render the leaf nodes
+                                if (node->numAttachedObjects() && 
+                                        !node->numChildren() && 
+                                        (node->getAttachedObject(0)->getMovableType() == "Entity") &&
+                                        node->getAttachedObject(0)->isVisible())
+                                {
+                                        getRenderQueue()->addRenderable(node);
+                                }
+
+                                // addbounding boxes instead of node itself
+                                //(*it)->_addBoundingBoxToQueue(getRenderQueue());
+                        }
+                        // add renderables itself
+                        if (mRenderNodesContentForViz) 
+                        {
+                                (*it)->queueObjects(cam, getRenderQueue(), false);
+                        }
+                }
+        }       
 }
 //-----------------------------------------------------------------------