Changeset 657 for OGRE/trunk/ogre_changes/OgreMain/src/OgreSceneManager.cpp

Timestamp:

02/20/06 19:06:03 (19 years ago)

Author:

mattausch

Message:

added ogre dependencies and patched ogre sources

File:

• OGRE/trunk/ogre_changes/OgreMain/src/OgreSceneManager.cpp (modified) (21 diffs)

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

@@ -375 +375 @@
     // Subclasses could do something smarter
     destList.clear();
-    Real squaredRadius = radius * radius;
 
     SceneLightList::iterator i, iend;
@@ -396 +395 @@
                 // only add in-range lights
                 Real range = lt->getAttenuationRange();
-                if ((lt->tempSquareDist - squaredRadius) <= (range * range))
+                Real maxDist = range + radius;
+                if (lt->tempSquareDist <= Math::Sqr(maxDist))
                 {
                     destList.push_back(lt);
@@ -554 +554 @@
     mSkyBoxEnabled = mSkyPlaneEnabled = mSkyDomeEnabled = false; 
 
+        // Clear render queue, empty completely
+        if (mRenderQueue)
+                mRenderQueue->clear(true);
+
 }
 //-----------------------------------------------------------------------
@@ -593 +597 @@
     AutoTrackingSceneNodes::iterator ai, aiend;
     aiend = mAutoTrackingSceneNodes.end();
-    for (ai = mAutoTrackingSceneNodes.begin(); ai != aiend; ++ai)
-    {
-        SceneNode* n = *ai;
+    for (ai = mAutoTrackingSceneNodes.begin(); ai != aiend; )
+    {
+                // Pre-increment incase we delete
+                AutoTrackingSceneNodes::iterator curri = ai++;
+        SceneNode* n = *curri;
         // Tracking this node
         if (n->getAutoTrackTarget() == i->second)
@@ -601 +607 @@
             // turn off, this will notify SceneManager to remove
             n->setAutoTracking(false);
-            // no need to reset iterator since set erase does not invalidate
         }
         // node is itself a tracker
         else if (n == i->second)
         {
-            mAutoTrackingSceneNodes.erase(ai);
+            mAutoTrackingSceneNodes.erase(curri);
         }
     }
@@ -814 +819 @@
     if (thisFrameNumber != lastFrameNumber)
     {
+        // Update controllers 
+        ControllerManager::getSingleton().updateAllControllers();
         // Update animations
         _applySceneAnimations();
-        // Update controllers 
-        ControllerManager::getSingleton().updateAllControllers();
         lastFrameNumber = thisFrameNumber;
     }
@@ -868 +873 @@
     }
 
+    // Tell params about viewport
+    mAutoParamDataSource.setCurrentViewport(vp);
     // Set the viewport
     setViewport(vp);
@@ -1409 +1416 @@
             {
                 // Someone requested we skip this queue
-                continue;
+                break;
             }
 
@@ -1713 +1720 @@
             mShadowReceiverPass->_load();
 
-            if (l->getCastShadows() && pGroup->getShadowsEnabled())
+            if (l->getCastShadows())
             {
                 renderTextureShadowReceiverQueueGroupObjects(pGroup);
@@ -1876 +1883 @@
         {
             // Ordinary pass
+            if (pGroup->getShadowsEnabled())
             renderModulativeTextureShadowedQueueGroupObjects(pGroup);
+                        else
+                                renderBasicQueueGroupObjects(pGroup);
         }
     }
@@ -2118 +2128 @@
 {
     mAmbientLight = colour;
-    mDestRenderSystem->setAmbientLight(colour.r, colour.g, colour.b);
 }
 //-----------------------------------------------------------------------
@@ -2656 +2665 @@
     {
         createShadowTextures(mShadowTextureSize, mShadowTextureCount, mShadowTextureFormat);
+    }
+    else
+    {
+        // Destroy shadow textures to optimise resource usage
+        destroyShadowTextures();
     }
 
@@ -2764 +2778 @@
         const Vector3* corners = camera->getWorldSpaceCorners();
         Vector3 min, max;
-        Vector3 extrude = light->getDirection() * -mShadowDirLightExtrudeDist;
+        Vector3 extrude = light->getDerivedDirection() * -mShadowDirLightExtrudeDist;
         // do first corner
         min = max = corners[0];
@@ -2792 +2806 @@
     else
     {
-        Sphere s(light->getPosition(), light->getAttenuationRange());
+        Sphere s(light->getDerivedPosition(), light->getAttenuationRange());
         // eliminate early if camera cannot see light sphere
         if (camera->isVisible(s))
@@ -2875 +2889 @@
         {
             mShadowDebugPass = matDebug->getTechnique(0)->getPass(0);
+
+            if (mDestRenderSystem->getCapabilities()->hasCapability(RSC_VERTEX_PROGRAM))
+            {
+                mInfiniteExtrusionParams = mShadowDebugPass->getVertexProgramParameters();
+            }
         }
     }
@@ -2915 +2934 @@
         {
             mShadowStencilPass = matStencil->getTechnique(0)->getPass(0);
+
+            if (mDestRenderSystem->getCapabilities()->hasCapability(RSC_VERTEX_PROGRAM))
+            {
+                mFiniteExtrusionParams = mShadowStencilPass->getVertexProgramParameters();
+            }
         }
     }
@@ -3029 +3053 @@
 Pass* SceneManager::deriveShadowCasterPass(Pass* pass)
 {
+        Pass* retPass = 0;
     switch (mShadowTechnique)
     {
     case SHADOWTYPE_TEXTURE_MODULATIVE:
-                if (mShadowTextureCustomCasterPass)
+                retPass = mShadowTextureCustomCasterPass ? 
+                        mShadowTextureCustomCasterPass : mShadowCasterPlainBlackPass;
+
+
+                // Special case alpha-blended passes
+                if ((pass->getSourceBlendFactor() == SBF_SOURCE_ALPHA && 
+                        pass->getDestBlendFactor() == SBF_ONE_MINUS_SOURCE_ALPHA) 
+                        || pass->getAlphaRejectFunction() != CMPF_ALWAYS_PASS)
                 {
-                        // Caster pass has been customised
+                        // Alpha blended passes must retain their transparency
+                        retPass->setAlphaRejectSettings(pass->getAlphaRejectFunction(), 
+                                pass->getAlphaRejectValue());
+                        retPass->setSceneBlending(pass->getSourceBlendFactor(), pass->getDestBlendFactor());
+                        retPass->getParent()->getParent()->setTransparencyCastsShadows(true);
+
+                        // So we allow the texture units, but override the colour functions
+                        // Copy texture state, shift up one since 0 is shadow texture
+                        size_t origPassTUCount = pass->getNumTextureUnitStates();
+                        for (size_t t = 0; t < origPassTUCount; ++t)
+                        {
+                                TextureUnitState* tex;
+                                if (retPass->getNumTextureUnitStates() <= t)
+                                {
+                                        tex = retPass->createTextureUnitState();
+                                }
+                                else
+                                {
+                                        tex = retPass->getTextureUnitState(t);
+                                }
+                                // copy base state
+                                (*tex) = *(pass->getTextureUnitState(t));
+                                // override colour function
+                                tex->setColourOperationEx(LBX_SOURCE1, LBS_MANUAL, LBS_CURRENT,
+                                        mShadowColour);
+
+                        }
+                        // Remove any extras
+                        while (retPass->getNumTextureUnitStates() > origPassTUCount)
+                        {
+                                retPass->removeTextureUnitState(origPassTUCount);
+                        }
+
+                }
+                else
+                {
+                        // reset
+                        retPass->setSceneBlending(SBF_ONE, SBF_ZERO);
+                        retPass->setAlphaRejectFunction(CMPF_ALWAYS_PASS);
+                        while (retPass->getNumTextureUnitStates() > 0)
+                        {
+                                retPass->removeTextureUnitState(0);
+                        }
+                }
+
+                // Propagate culling modes
+                retPass->setCullingMode(pass->getCullingMode());
+                retPass->setManualCullingMode(pass->getManualCullingMode());
+
 
                         if (!pass->getShadowCasterVertexProgramName().empty())
                         {
                                 // Have to merge the shadow caster vertex program in
-                                mShadowTextureCustomCasterPass->setVertexProgram(
+                        retPass->setVertexProgram(
                                         pass->getShadowCasterVertexProgramName());
-                                const GpuProgramPtr& prg = mShadowTextureCustomCasterPass->getVertexProgram();
+                        const GpuProgramPtr& prg = retPass->getVertexProgram();
                                 // Load this program if not done already
                                 if (!prg->isLoaded())
                                         prg->load();
                                 // Copy params
-                                mShadowTextureCustomCasterPass->setVertexProgramParameters(
+                        retPass->setVertexProgramParameters(
                                         pass->getShadowCasterVertexProgramParameters());
+                        if (retPass == mShadowTextureCustomCasterPass)
+                        {
                                 // mark that we've overridden the standard
                                 mShadowTextureCasterVPDirty = true;
+                        }
                                 // Also have to hack the light autoparams, that is done later
                         }
-                        else if (mShadowTextureCasterVPDirty)
+                else 
+                {
+                        retPass->setVertexProgram(StringUtil::BLANK);
+                        if (mShadowTextureCasterVPDirty)
                         {
                                 // reset
@@ -3065 +3151 @@
                                 mShadowTextureCasterVPDirty = false;
                         }
-                        return mShadowTextureCustomCasterPass;
                 }
-                else
-                {
-                        // Standard pass
-                        if (pass->hasVertexProgram())
-                        {
-                                // Have to merge the shadow caster vertex program in
-                                // This may in fact be blank, in which case it falls back on 
-                                // fixed function
-                                mShadowCasterPlainBlackPass->setVertexProgram(
-                                        pass->getShadowCasterVertexProgramName());
-                                // Did this result in a new vertex program?
-                                if (mShadowCasterPlainBlackPass->hasVertexProgram())
-                                {
-                                        const GpuProgramPtr& prg = mShadowCasterPlainBlackPass->getVertexProgram();
-                                        // Load this program if not done already
-                                        if (!prg->isLoaded())
-                                                prg->load();
-                                        // Copy params
-                                        mShadowCasterPlainBlackPass->setVertexProgramParameters(
-                                                pass->getShadowCasterVertexProgramParameters());
-                                }
-                                // Also have to hack the light autoparams, that is done later
-                        }
-                        else if (mShadowCasterPlainBlackPass->hasVertexProgram())
-                        {
-                                // reset
-                                mShadowCasterPlainBlackPass->setVertexProgram("");
-                        }
-                        return mShadowCasterPlainBlackPass;
-                }
+                return retPass;
     default:
         return pass;
@@ -3301 +3357 @@
         {
         ShadowCaster* caster = *si;
-                bool zfailAlgo = false;
+                bool zfailAlgo = camera->isCustomNearClipPlaneEnabled();
                 unsigned long flags = 0;
 
@@ -3705 +3761 @@
 
     // destroy existing
-    ShadowTextureList::iterator i, iend;
-    iend = mShadowTextures.end();
-    for (i = mShadowTextures.begin(); i != iend; ++i)
-    {
-        RenderTexture* r = *i;
-        // remove camera and destroy texture
-        removeCamera(r->getViewport(0)->getCamera());
-        mDestRenderSystem->destroyRenderTexture(r->getName());
-    }
-    mShadowTextures.clear();
+        destroyShadowTextures();
 
     // Recreate shadow textures
@@ -3762 +3809 @@
 
     }
+}
+//---------------------------------------------------------------------
+void SceneManager::destroyShadowTextures(void)
+{
+    ShadowTextureList::iterator i, iend;
+    iend = mShadowTextures.end();
+    for (i = mShadowTextures.begin(); i != iend; ++i)
+    {
+        RenderTexture* r = *i;
+        // remove camera and destroy texture
+        removeCamera(r->getViewport(0)->getCamera());
+        mDestRenderSystem->destroyRenderTexture(r->getName());
+    }
+    mShadowTextures.clear();
 }
 //---------------------------------------------------------------------