Changeset 150 for trunk/VUT

Timestamp:

06/27/05 17:22:08 (20 years ago)

Author:

mattausch

Message:

added item buffer functionality

Location:

trunk/VUT

Files:

• GtpVisibility/include/VisibilityInfo.h (modified) (1 diff)
• GtpVisibility/src/VisibilityInfo.cpp (modified) (1 diff)
• Ogre/scripts/Plugin_VisibilitySceneManager.vcproj (modified) (2 diffs)
• Ogre/src/OgrePlatformQueryManager.cpp (modified) (6 diffs)
• Ogre/src/OgreVisibilityTerrainSceneManager.cpp (modified) (13 diffs)
• work/TestCullingTerrain/TestCullingTerrainApplication.cpp (modified) (1 diff)
• work/ogre_changes/OgreMain/include/OgreRenderSystem.h (added)
• work/ogre_changes/OgreMain/src/OgreRenderSystem.cpp (added)
• work/ogre_changes/RenderSystems/GL/src/OgreGLRenderSystem.cpp (modified) (2 diffs)

trunk/VUT/GtpVisibility/include/VisibilityInfo.h

@@ -28 +28 @@
         */
         void AddVisibility(const VisibilityInfo &info);
-
+        /** Adds visibility to current visibility information.
+        */
+        void AddVisibility(const int visiblePixels, const int vrojectedPixels);
 
 protected:
-        /** number of visible pixels. */
+        /** number of visible pixels. 
+        */
     int mVisiblePixels;
-        /** number of projected pixels */
+        /** number of projected pixels 
+        */
         int mProjectedPixels;
 };

trunk/VUT/GtpVisibility/src/VisibilityInfo.cpp

@@ -45 +45 @@
         mProjectedPixels += info.GetProjectedPixels();
 }
+//-----------------------------------------------------------------------
+void VisibilityInfo::AddVisibility(const int visiblePixels, const int projectedPixels)
+{
+        mVisiblePixels +=visiblePixels;
+        mProjectedPixels +=  projectedPixels;
+}
+
 /****************************************************/
 /*              NodeInfo implementation             */
 /****************************************************/
+
+
 //-----------------------------------------------------------------------
 NodeInfo::NodeInfo(HierarchyNode *node, const int visiblePixels, const int projectedPixels): 

trunk/VUT/Ogre/scripts/Plugin_VisibilitySceneManager.vcproj

@@ -192 +192 @@
                                 Filter="h;hpp;hxx;hm;inl;inc">
                                 <File
+                                        RelativePath="..\include\OgreItemBufferQueryManager.h">
+                                </File>
+                                <File
                                         RelativePath="..\include\OgrePlatformHierarchyInterface.h">
                                 </File>
@@ -222 +225 @@
                                 Name="Source Files"
                                 Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
+                                <File
+                                        RelativePath="..\src\OgreItemBufferQueryManager.cpp">
+                                </File>
                                 <File
                                         RelativePath="..\src\OgrePlatformHierarchyInterface.cpp">

trunk/VUT/Ogre/src/OgrePlatformQueryManager.cpp

@@ -31 +31 @@
         //-- Render scene to get conservative visibility and fill depth buffer 
 
-        // can do const_cast because Camera no changed in renderScene
+        // const_cast allowed because camera is not changed in renderScene
         Camera *pCam = const_cast<Camera *>(&camera); 
 
+        // disable overlays, reset them later
         bool overlayEnabled = mViewport->getOverlaysEnabled();
         mViewport->setOverlaysEnabled(false);
@@ -39 +40 @@
 
         /* 
-                Two query lists:
-                We test two to get exact visibility with regard to the current camera and
-                issue all queries at once to avoid starvation & stalls.
+                Two query lists for projected pixels and for visibile pixels:
+                We test queries after a rendering pass 
+                to get exact visibility with regard to the current camera.
+                We issue all queries at once to avoid starvation & stalls.
         */
         GtpVisibility::QueryList queryList[2];
@@ -100 +102 @@
         // this option must be provided by the scene manager
         pfHierarchyInterface->GetSceneManager()->setOption("DepthWrite", &enableDepthWrite);
-        
+        // reset old overlay status
         mViewport->setOverlaysEnabled(overlayEnabled);
 
         //---- collect results
-        
-        std::pair<InfoContainer<GtpVisibility::NodeInfo>::iterator, bool> insertNode;
-        std::pair<InfoContainer<GtpVisibility::MeshInfo>::iterator, bool> insertGeom;
-
         GtpVisibility::QueryList::iterator visQueryIt, projQueryIt;
 
@@ -236 +234 @@
         mViewport->setCamera(savedCam);
 
-        // --- single out duplicates
-
-        // before duplicates can be deleted we have to add up visibility
+        // --- remove duplicates (happens if an object is on the edge of the viewport)
+
+        // before duplicates can be deleted we have to add up their visibility
 
         // --- visible nodes
@@ -261 +259 @@
         }
         
-        // now delete duplicates
+        // really delete duplicates
         visibleNodes->erase( std::unique(visibleNodes->begin(), 
                 visibleNodes->end(), nodeinfo_eq), visibleNodes->end());
@@ -286 +284 @@
         }
 
-        // now delete duplicates
+        // really delete duplicates
         visibleGeometry->erase(std::unique(visibleGeometry->begin(), visibleGeometry->end(), 
                 meshinfo_eq), visibleGeometry->end());

trunk/VUT/Ogre/src/OgreVisibilityTerrainSceneManager.cpp

@@ -78 +78 @@
                 mItemBufferPass->setDepthWriteEnabled(true);
                 mItemBufferPass->setLightingEnabled(true);
+                //mItemBufferPass->setLightingEnabled(false);
         }
         else
@@ -83 +84 @@
                 mItemBufferPass = itemBufferMat->getTechnique(0)->getPass(0);
         }
-        mItemBufferPass->setAmbient(1, 1, 0);
+        //mItemBufferPass->setAmbient(1, 1, 0);
 }
 //-----------------------------------------------------------------------
@@ -213 +214 @@
 void VisibilityTerrainSceneManager::_findVisibleObjects(Camera* cam, bool onlyShadowCasters)
 {
-        // needs full ambient lighting for item colors to be exact
-        //if (mRenderItemBuffer) {setAmbientLight(ColourValue(1,1,1,1));}
-        
         //-- show visible scene nodes and octree bounding boxes from last frame
         if (mShowVisualization)
@@ -244 +242 @@
 void VisibilityTerrainSceneManager::_renderVisibleObjects()
 {
+        ColourValue savedAmbient = mAmbientLight;
+
         // visualization or shadow pass: apply standard rendering
         if (mShowVisualization || (mShadowTechnique == SHADOWTYPE_TEXTURE_MODULATIVE && 
@@ -305 +305 @@
                 mLeavePassesInQueue = 0;
                 mShadowTechnique = mSavedShadowTechnique;
-
+                mRenderItemBuffer = false;
 
                 // add visible nodes found by the visibility culling algorithm
@@ -327 +327 @@
 
         getRenderQueue()->clear();
+
+        // reset ambient light
+        setAmbientLight(savedAmbient);
         //WriteLog(); // write out stats
 }
@@ -399 +402 @@
         {
                 mEnableDepthWrite = (*static_cast<const bool *>(val));
+                return true;
+        }
+        if (key == "ItemBuffer")
+        {
+                mRenderItemBuffer = (*static_cast<const bool *>(val));
                 return true;
         }
@@ -531 +539 @@
 
         // ----- TRANSPARENT LOOP: must be handled differently 
-        // although we don't really     care about transparents for the item buffer
         // TODO: HOW TO HANDLE OCCLUDED OBJECTS ????
         RenderPriorityGroup::TransparentRenderablePassList
@@ -551 +558 @@
 {
         static LightList nullLightList;
-
-        Real col = (Real)rend->getId() / (Real)mCurrentEntityId;
-
-        mItemBufferPass->setAmbient(ColourValue(0, col, 0));
-        //mItemBufferPass->setDiffuse(ColourValue(0, col, 0));
-    //mItemBufferPass->setSpecular(ColourValue(0, col, 0));
+        
+        int col[4];
+        
+        col[0] = (rend->getId() >> 16) & 255;
+        col[1] = (rend->getId() >> 8) & 255;
+        col[2] = rend->getId() & 255;
+        col[3] = 255;
+
+        //mDestRenderSystem->setColour(col[0], col[1], col[2], col[3]);
     
+        mItemBufferPass->setAmbient(ColourValue(col[0] / 255.0f,
+                                                                                    col[1] / 255.0f, 
+                                                                                        col[2] / 255.0f, 1));
+
         // set vertex program of current pass
         if (pass->hasVertexProgram())
@@ -581 +595 @@
         //Pass *usedPass = setPass(pass);
         
-        std::stringstream d; d << "item buffer id: " << rend->getId() << ", col: " << col;
-        LogManager::getSingleton().logMessage(d.str());
+        if (rend->getId() > 0)
+        {
+                std::stringstream d; d << "item buffer id: " << rend->getId() << ", col: " << col[0] <<
+                        " " << col[1] << " " << col[2] << " " << col[3];
+                LogManager::getSingleton().logMessage(d.str());
+        }
 
         // Render a single object, this will set up auto params if required
         renderSingleObject(rend, usedPass, false, &nullLightList);
+
+        // reset colour
+        //mDestRenderSystem->setColour(255, 255, 255, 255);
 }
 //-----------------------------------------------------------------------
@@ -600 +621 @@
         for (int i = 0; i < (int)ent->getNumSubEntities(); ++i)
         {
-                ent->getSubEntity(i)->setId(mCurrentEntityId ++);
-        }
+                ent->getSubEntity(i)->setId(mCurrentEntityId);
+        }
+
+        ++ mCurrentEntityId;
 
         return ent;
@@ -615 +638 @@
 
 
+        mLeavePassesInQueue = 0;
+        
+        // item buffer needs full ambient lighting to use item colors as unique id
+        if (mUseItemBuffer) 
+        {
+                mRenderItemBuffer = true;
+                setAmbientLight(ColourValue(1,1,1,1));
+        }
+
+
         // set passes which should be stored in render queue 
         // for rendering after hierarchical culling
-        mLeavePassesInQueue = 0;
-        
+
         if (mShadowTechnique == SHADOWTYPE_STENCIL_ADDITIVE)
         {
@@ -662 +694 @@
 
         // set depth pass flag before rendering
-    mRenderDepthPass = mUseDepthPass;
-        
+        mRenderDepthPass = mUseDepthPass;
         // set flag for skipping transparents in the hierarchical culling pass
         mSkipTransparents = mUseDepthPass || 

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.cpp

@@ -162 +162 @@
 
                 // the objects are generated on the whole terrain
-                mTerrainContentGenerator->GenerateScene(1500, "robot");
-                //mTerrainContentGenerator->GenerateScene(1500, "athene");
+                //mTerrainContentGenerator->GenerateScene(1500, "robot");
+                mTerrainContentGenerator->GenerateScene(1500, "athene");
                 //mTerrainContentGenerator->GenerateScene(500, "ninja");
         }

trunk/VUT/work/ogre_changes/RenderSystems/GL/src/OgreGLRenderSystem.cpp

@@ -2246 +2246 @@
             glDisableVertexAttribArrayARB_ptr(1); // disable weights
         }
+#ifndef GTP_VISIBILITY_MODIFIED_OGRE
         glColor4f(1,1,1,1);
+#else
+                glColor4ub(mColour[0], mColour[1], mColour[2], mColour[3]);
+#endif  // GTP_VISIBILITY_MODIFIED_OGRE
+
         glSecondaryColor3fEXT_ptr(0.0f, 0.0f, 0.0f);
 
@@ -2446 +2451 @@
         dest[3][2] = -1;
     }
-
     // ------------------------------------------------------------------
     void GLRenderSystem::setClipPlane (ushort index, Real A, Real B, Real C, Real D)