Changeset 921 for OGRE/trunk/ogre_changes/Ogre1.2/OgreMain/src

Timestamp:

05/06/06 18:47:53 (19 years ago)

Author:

mattausch

Message:

added updates for visibility

Location:

OGRE/trunk/ogre_changes/Ogre1.2/OgreMain/src

Files:

• OgreCamera.cpp (added)
• OgreFrustum.cpp (added)
• OgreRenderQueueSortingGrouping.cpp (added)
• OgreSceneManager.cpp (modified) (5 diffs)
• OgreSceneNode.cpp (added)

OGRE/trunk/ogre_changes/Ogre1.2/OgreMain/src/OgreSceneManager.cpp

@@ -1046 +1046 @@
 
         // Prepare render queue for receiving new objects
-#ifdef GAMETOOLS_ILLUMINATION_MODULE 
-        if (mFindVisibleObjects)
-                prepareRenderQueue();
-#else
-                prepareRenderQueue();
-#endif
-
+        prepareRenderQueue();
 
     if (mFindVisibleObjects)
@@ -1304 +1298 @@
             }
             // Set active frame
-            boxMat->getBestTechnique()->getPass(0)->getTextureUnitState(0)
-                ->setCurrentFrame(i);
+                        Material::TechniqueIterator ti = boxMat->getSupportedTechniqueIterator();
+                        while (ti.hasMoreElements())
+                        {
+                                Technique* tech = ti.getNext();
+                                tech->getPass(0)->getTextureUnitState(0)->setCurrentFrame(i);
+                        }
 
             mSkyBoxEntity[i]->setMaterialName(boxMat->getName());
@@ -2207 +2205 @@
         return false;
     }
-
-#ifdef GAMETOOLS_ILLUMINATION_MODULE
-        if(!pass->isActive())
-                return false;
-#endif
 
     return true;
@@ -4166 +4159 @@
         mShadowIndexBuffer = HardwareBufferManager::getSingleton().
             createIndexBuffer(HardwareIndexBuffer::IT_16BIT, 
-            mShadowIndexBufferSize, 
+            size, 
             HardwareBuffer::HBU_DYNAMIC_WRITE_ONLY_DISCARDABLE, 
             false);
@@ -4859 +4852 @@
 }
 
-}
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
+//-----------------------------------------------------------------------
+const Pass* SceneManager::setPassWrapper(Pass* pass)
+{
+        return _setPass(pass);
+}
+//-----------------------------------------------------------------------
+void SceneManager::_renderSceneNode(Camera *cam, SceneNode *node, const int leavePassesInQueue)
+{
+        // delete previously rendered objects from renderqueue
+        _deleteRenderedQueueGroups(leavePassesInQueue);
+
+        node->_findVisibleObjects(cam, getRenderQueue(), false, mDisplayNodes, false);
+        SceneManager::_renderVisibleObjects();
+}
+//-----------------------------------------------------------------------
+void SceneManager::_deleteRenderedQueueGroups(const int leavePassesInQueue)
+{       
+        RenderQueue::QueueGroupIterator queueIt = 
+                getRenderQueue()->_getQueueGroupIterator();
+
+        //-- find currently processed queue groups and delelete them from render queue
+        while (queueIt.hasMoreElements())
+        {
+                RenderQueueGroupID qId = static_cast<RenderQueueGroupID>(queueIt.peekNextKey());
+                RenderQueueGroup* pGroup = queueIt.getNext();
+
+                if (isRenderQueueToBeProcessed(qId))
+                {
+                        pGroup->clear(leavePassesInQueue);
+                }
+        }       
+
+        // Now trigger the pending pass updates
+        // Pass::processPendingPassUpdates();
+}
+
+//-----------------------------------------------------------------------
+/*void SceneManager::renderEntity(Entity *ent)
+{
+        int n = (int)ent->getNumSubEntities();
+
+        for (int i = 0; i < n; ++i)
+        {
+                Pass *pass = setPass(ent->getSubEntity(i)->getTechnique()->getPass(0));
+
+                _renderSingleObject(ent->getSubEntity(i), pass, false);
+        }
+}*/
+//-----------------------------------------------------------------------
+void SceneManager::_renderMovableObject(MovableObject *mov, const int leavePassesInQueue)
+{
+        // delete previously rendered objects from renderqueue
+        _deleteRenderedQueueGroups(leavePassesInQueue);
+
+        mov->_updateRenderQueue(getRenderQueue());
+        SceneManager::_renderVisibleObjects();
+}
+//-----------------------------------------------------------------------
+void SceneManager::_renderSingleRenderable(Renderable *rend)
+{
+        Pass *pass = rend->getTechnique()->getPass(0);
+        _setPass(pass);
+        renderSingleObject(rend, pass, false);
+}
+//-----------------------------------------------------------------------
+void SceneManager::useRenderableViewProjModeWrapper(Renderable* pRend)
+{
+        useRenderableViewProjMode(pRend);
+}
+#endif //GTP_VISIBILITY_MODIFIED_OGRE
+
+}