Changeset 129 for trunk

Timestamp:

06/10/05 17:28:14 (20 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT

Files:

• Ogre/include/OgreVisibilityTerrainSceneManager.h (modified) (1 diff)
• Ogre/src/OgreVisibilityTerrainSceneManager.cpp (modified) (7 diffs)
• scripts/GtpVisibility.suo (modified) (previous)

trunk/VUT/Ogre/include/OgreVisibilityTerrainSceneManager.h

@@ -68 +68 @@
 
         void RenderItemBuffer(RenderPriorityGroup* pGroup);
-        void RenderSingleObjectForItemBuffer(Renderable *rend);
+        void RenderSingleObjectForItemBuffer(Renderable *rend, Pass *pass);
         void renderQueueGroupObjects(RenderQueueGroup* pGroup);
 

trunk/VUT/Ogre/src/OgreVisibilityTerrainSceneManager.cpp

@@ -77 +77 @@
                 mItemBufferPass = itemBufferMat->getTechnique(0)->getPass(0);
         }
-        mItemBufferPass->setAmbient(0, 0, 0);
+        mItemBufferPass->setAmbient(1, 1, 0);
 }
 //-----------------------------------------------------------------------
@@ -221 +221 @@
 void VisibilityTerrainSceneManager::_renderVisibleObjects()
 {
-    std::stringstream d;
+        /*
+        std::stringstream d;
         d << "Terrain render level: " << TerrainRenderable::getCurrentRenderLevelIndex();
         LogManager::getSingleton().logMessage(d.str());
@@ -232 +233 @@
                 renderLevel = 0;
         }
-
+*/
         // visualization: apply standard rendering
         if (mShowVisualization)
         {       
                 TerrainSceneManager::_renderVisibleObjects();
-                TerrainRenderable::setCurrentRenderLevelIndex(renderLevel);
+        //      TerrainRenderable::setCurrentRenderLevelIndex(renderLevel);
                 return;
         }
@@ -308 +309 @@
         TerrainSceneManager::_renderVisibleObjects();
 
-        TerrainRenderable::setCurrentRenderLevelIndex(renderLevel);
+        //TerrainRenderable::setCurrentRenderLevelIndex(renderLevel);
         //WriteLog(); // write out stats
 }
@@ -373 +374 @@
         // notifiy that frame has ended so terrain render level can be reset for correct
         // terrain rendering
-        if (key == "TerrainLevelIdx")
+/*      if (key == "TerrainLevelIdx")
         {
                 TerrainRenderable::setCurrentRenderLevelIndex((*static_cast<const int *>(val)));
-        }
+                return true;
+        }*/
         return VisibilityOptionsManager(mVisibilityManager, mHierarchyInterface).
                 setOption(key, val) || TerrainSceneManager::setOption(key, val);
@@ -496 +498 @@
                 for (irend = rendList->begin(); irend != irendend; ++irend)
                 {
-                        RenderSingleObjectForItemBuffer(*irend);
-                }
-        }
-
-        // ----- TRANSPARENT LOOP
+                        std::stringstream d; d << "itembuffer, pass name: " << 
+                                ipass->first->getParent()->getParent()->getName();
+                                //<< ", renderable name: " << irend->
+
+                        LogManager::getSingleton().logMessage(d.str());
+                        
+                        //if(ipass->first->getParent()->getParent()->getName() == "Examples/Athene")
+                                //<< ", renderable name: " << irend->
+                                RenderSingleObjectForItemBuffer(*irend, ipass->first);
+                                RenderSingleObjectForOcclusionQuery(
+                }
+        }
+
+        // ----- TRANSPARENT LOOP: must be handlet differently altough we don't really
+        // care about transparents for the item buffer
+        // TODO: HOW TO HANDLE OCCLUDED OBJECTS ????
         RenderPriorityGroup::TransparentRenderablePassList
                 transpObjs = pGroup->_getTransparentPasses();
@@ -508 +521 @@
         for (itrans = transpObjs.begin(); itrans != itransend; ++itrans)
         {
-                // Render only first pass
+                // like for solids, render only first pass
                 if (itrans->pass->getIndex() == 0)
-                {                       
-                        RenderSingleObjectForItemBuffer(itrans->renderable);
+                {       
+                        RenderSingleObjectForItemBuffer(itrans->renderable, itrans->pass);
                 }
         } 
 }
 //-----------------------------------------------------------------------
-void VisibilityTerrainSceneManager::RenderSingleObjectForItemBuffer(Renderable *rend)
+void VisibilityTerrainSceneManager::RenderSingleObjectForItemBuffer(Renderable *rend, Pass *pass)
 {
         static LightList nullLightList;
+
         Real col = (Real)rend->getId() / (Real)mCurrentEntityId;
-        mItemBufferPass->setAmbient(col, 0, 0);
-
-        setPass(mItemBufferPass);
-
+
+        mItemBufferPass->setAmbient(ColourValue(0, 1, 1));
+        //mItemBufferPass->setDiffuse(ColourValue(0, col, 0));
+//      mItemBufferPass->setSpecular(ColourValue(0, col, 0));
+//      mItemBufferPass->_load();
+
+        // set vertex program of current pass
+        if (pass->hasVertexProgram())
+        {
+                mItemBufferPass->setVertexProgram(pass->getVertexProgramName());
+
+                if (mItemBufferPass->hasVertexProgram())
+                {
+                        const GpuProgramPtr& prg = mItemBufferPass->getVertexProgram();
+                        // Load this program if not done already
+                        if (!prg->isLoaded())
+                                prg->load();
+                        // Copy params
+                        mItemBufferPass->setVertexProgramParameters(pass->getVertexProgramParameters());
+                }
+        }
+        else if (mItemBufferPass->hasVertexProgram())
+        {
+                mItemBufferPass->setVertexProgram("");
+        }
+
+        //LogManager::getSingleton().logMessage("has vertex program");
+        Pass *usedPass = setPass(mItemBufferPass); 
+//Pass *usedPass = setPass(pass);
         std::stringstream d;
         d << "item buffer id: " << rend->getId() << ", col: " << col;
         LogManager::getSingleton().logMessage(d.str());
+
         // Render a single object, this will set up auto params if required
-        renderSingleObject(rend, mItemBufferPass, true, &nullLightList);
+        renderSingleObject(rend, usedPass, false, &nullLightList);
 }
 //-----------------------------------------------------------------------