Changeset 131 for trunk

Timestamp:

06/14/05 09:08:04 (20 years ago)

Author:

mattausch

Message:

updated ogre_changes directory (added terrainrenderable, , renderable, scenemanager::renderMovable

Location:

trunk/VUT/work/ogre_changes

Files:

• OgreMain/include/OgreRenderable.h (added)
• OgreMain/include/OgreSceneManager.h (modified) (1 diff)
• OgreMain/src/OgreSceneManager.cpp (modified) (22 diffs)
• Plugins/OctreeSceneManager/include/OgreTerrainRenderable.h (added)

trunk/VUT/work/ogre_changes/OgreMain/include/OgreSceneManager.h

@@ -149 +149 @@
         */
         virtual Pass* setPass(Pass* pass);
+
+                /** Renders an Ogre Entity.
+                */
+                //void renderEntity(Entity *ent);
+                
+                /** Renders an Ogre MovableObject.
+                */
+                void _renderMovableObject(MovableObject *mov, const bool leaveTransparentsInQueue);
+
 #endif // GTP_VISIBILITY_MODIFIED_OGRE
 

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

@@ -646 +646 @@
 
     // TEST
-    /*
-    LogManager::getSingleton().logMessage("BEGIN PASS " + StringConverter::toString(pass->getIndex()) + 
-    " of " + pass->getParent()->getParent()->getName());
-    */
+    
+    //LogManager::getSingleton().logMessage("BEGIN PASS " + StringConverter::toString(pass->getIndex()) + 
+    //" of " + pass->getParent()->getParent()->getName() + "\n");
+    
     bool passSurfaceAndLightParams = true;
 
@@ -779 +779 @@
 void SceneManager::_renderScene(Camera* camera, Viewport* vp, bool includeOverlays)
 {
+        LogManager::getSingleton().logMessage("***********RENDER SCENE************");
     Root::getSingleton()._setCurrentSceneManager(this);
     // Prep Pass for use in debug shadows
@@ -1540 +1541 @@
             renderShadowVolumesToStencil(l, mCameraInProgress);
             // render full-screen shadow modulator for all lights
+                        //LogManager::getSingleton().logMessage("setting shadow modulative pass");
             setPass(mShadowModulativePass);
             // turn stencil check on
@@ -1800 +1802 @@
             continue;
 
+                //LogManager::getSingleton().logMessage("setting solid pass");
         // For solids, we try to do each pass in turn
         Pass* usedPass = setPass(ipass->first);
@@ -1830 +1833 @@
         itrans != itransend; ++itrans)
     {
+                //LogManager::getSingleton().logMessage("setting transparent pass");
         // For transparents, we have to accept that we can't sort entirely by pass
         setPass(itrans->pass);
@@ -1915 +1919 @@
                 if (p->getParent()->getParent()->getTransparencyCastsShadows())
                 {
+                        //LogManager::getSingleton().logMessage("setting transparent shadow pass");
                         setPass(p);
                         renderSingleObject(itrans->renderable, p, doLightIteration, manualLightList);
@@ -2413 +2418 @@
         mDestRenderSystem->_beginFrame();
 
+        //LogManager::getSingleton().logMessage("setting manual pass");
     setPass(pass);
     mDestRenderSystem->_render(*rend);
@@ -2656 +2662 @@
                 if (l->isVisible())
                 {
-        if (l->getType() == Light::LT_DIRECTIONAL)
-        {
-            // Always visible
-            mLightsAffectingFrustum.push_back(l);
-        }
-        else
-        {
-            // NB treating spotlight as point for simplicity
-            // Just see if the lights attenuation range is within the frustum
-            sphere.setCenter(l->getDerivedPosition());
-            sphere.setRadius(l->getAttenuationRange());
-            if (camera->isVisible(sphere))
-            {
-                mLightsAffectingFrustum.push_back(l);
-            }
-
-        }
-    }
+                        if (l->getType() == Light::LT_DIRECTIONAL)
+                        {
+                                // Always visible
+                                mLightsAffectingFrustum.push_back(l);
+                        }
+                        else
+                        {
+                                // NB treating spotlight as point for simplicity
+                                // Just see if the lights attenuation range is within the frustum
+                                sphere.setCenter(l->getDerivedPosition());
+                                sphere.setRadius(l->getAttenuationRange());
+                                if (camera->isVisible(sphere))
+                                {
+                                        mLightsAffectingFrustum.push_back(l);
+                                }
+
+                        }
+                }
     }
 
@@ -3008 +3014 @@
 Pass* SceneManager::deriveShadowCasterPass(Pass* pass)
 {
+        //LogManager::getSingleton().logMessage("*********derive shadow caster pass*********");
     switch (mShadowTechnique)
     {
@@ -3013 +3020 @@
                 if (mShadowTextureCustomCasterPass)
                 {
+                        //LogManager::getSingleton().logMessage("custom caster pass");
                         // Caster pass has been customised
 
                         if (!pass->getShadowCasterVertexProgramName().empty())
                         {
+                                //LogManager::getSingleton().logMessage("custom caster pass has vertex program");
                                 // Have to merge the shadow caster vertex program in
                                 mShadowTextureCustomCasterPass->setVertexProgram(
@@ -3033 +3042 @@
                         else if (mShadowTextureCasterVPDirty)
                         {
+                                //LogManager::getSingleton().logMessage("caster pass dirty");
                                 // reset
                                 mShadowTextureCustomCasterPass->setVertexProgram(
@@ -3048 +3058 @@
                 else
                 {
+                        //LogManager::getSingleton().logMessage("standard caster pass");
                         // Standard pass
                         if (pass->hasVertexProgram())
                         {
+                                //LogManager::getSingleton().logMessage("standard caster pass has vertex program");
                                 // Have to merge the shadow caster vertex program in
                                 // This may in fact be blank, in which case it falls back on 
@@ -3071 +3083 @@
                         else if (mShadowCasterPlainBlackPass->hasVertexProgram())
                         {
+                                //LogManager::getSingleton().logMessage("standard caster pass no vertex program");
                                 // reset
                                 mShadowCasterPlainBlackPass->setVertexProgram("");
@@ -3084 +3097 @@
 Pass* SceneManager::deriveShadowReceiverPass(Pass* pass)
 {
-
+        //LogManager::getSingleton().logMessage("*********derive shadow receiver pass*********");
     switch (mShadowTechnique)
     {
@@ -3091 +3104 @@
                 {
                         // Receiver pass has been customised
-
+                        //LogManager::getSingleton().logMessage("custom receiver pass");
                         if (!pass->getShadowReceiverVertexProgramName().empty())
                         {
+                                //LogManager::getSingleton().logMessage("merge receiver pass shadow vertex program");
                                 // Have to merge the shadow Receiver vertex program in
                                 mShadowTextureCustomReceiverPass->setVertexProgram(
@@ -3110 +3124 @@
                         else if (mShadowTextureReceiverVPDirty)
                         {
+                                //LogManager::getSingleton().logMessage("receiver pass dirty");
                                 // reset
                                 mShadowTextureCustomReceiverPass->setVertexProgram(
@@ -3125 +3140 @@
                 else
                 {
+                        //LogManager::getSingleton().logMessage("no custom receiver pass");
                         if (pass->hasVertexProgram())
                         {
+                                //LogManager::getSingleton().logMessage("standard receiver pass has vertex program");
                                 // Have to merge the receiver vertex program in
                                 // This may return "" which means fixed function will be used
@@ -3146 +3163 @@
                         else if (mShadowReceiverPass->hasVertexProgram())
                         {
+                                //LogManager::getSingleton().logMessage("standard receiver pass no vertex program");
                                 // reset
                                 mShadowReceiverPass->setVertexProgram("");
@@ -3367 +3385 @@
                 setColourOperationEx(LBX_MODULATE, LBS_MANUAL, LBS_CURRENT,
                 zfailAlgo ? ColourValue(0.7, 0.0, 0.2) : ColourValue(0.0, 0.7, 0.2));
+                        //LogManager::getSingleton().logMessage("setting shadow debug pass");
             setPass(mShadowDebugPass);
             renderShadowVolumeObjects(iShadowRenderables, mShadowDebugPass, &lightList, flags,
@@ -4183 +4202 @@
         node->_findVisibleObjects(cam, getRenderQueue(), false, mDisplayNodes, false);
         SceneManager::_renderVisibleObjects();
-        
+
         // delete all rendered objects from renderqueue
         _deleteRenderedQueueGroups(leaveTransparentsInQueue);
@@ -4206 +4225 @@
                         else
                         {
-                        pGroup->clear();
-        }
+                                pGroup->clear();
+                        }
                 }
         }
@@ -4214 +4233 @@
         // 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 bool leaveTransparentsInQueue)
+{
+        mov->_updateRenderQueue(getRenderQueue());
+        SceneManager::_renderVisibleObjects();
+        
+        // delete rendered objects from renderqueue
+        //TODO: should be first
+        _deleteRenderedQueueGroups(leaveTransparentsInQueue);
+}
 #endif //GTP_VISIBILITY_MODIFIED_OGRE
 }