Changeset 2184 for GTP/trunk

Timestamp:

03/02/07 17:39:47 (18 years ago)

Author:

mattausch

Message:

debug version: please don't check out

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC

Files:

• OGRE/include/OgreOcclusionCullingSceneManager.h (modified) (1 diff)
• OGRE/src/OgreOcclusionCullingSceneManager.cpp (modified) (14 diffs)
• OGRE/src/OgrePlatformHierarchyInterface.cpp (modified) (4 diffs)
• OGRE/src/OgrePlatformQueryManager.cpp (modified) (1 diff)
• OGRE/src/OgreSolidBoundingBox.cpp (modified) (1 diff)
• OGRE/src/Plugin_VisibilitySceneManager.vcproj (modified) (1 diff)
• src/CoherentHierarchicalCullingManager.cpp (modified) (1 diff)

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include/OgreOcclusionCullingSceneManager.h

@@ -298 +298 @@
 
         ObjReader *mObjReader;
+
+        Camera *mDummyCamera;
 };
 

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreOcclusionCullingSceneManager.cpp

@@ -59 +59 @@
 mElementaryViewCell(NULL),
 mDeleteQueueAfterRendering(true),
-mNormalExecution(false),
+mNormalExecution(true),
 mShowViewCells(false),
 mViewCellsGeometryLoaded(false),
@@ -730 +730 @@
 void OcclusionCullingSceneManager::_renderVisibleObjects()
 {
+        if (mNormalExecution)
+        {
+                // the standard octree rendering mode
+                TerrainSceneManager::_renderVisibleObjects();
+                //getRenderQueue()->clear(flushQueue);
+                return;
+        }
+
         const bool flushQueue = 
                 mDeleteQueueAfterRendering && ((mCurrentFrame % mFlushRate) == 0);
         ++ mCurrentFrame;
 
-        if (mNormalExecution)
-        {
-                // the standard octree rendering mode
-                TerrainSceneManager::_renderVisibleObjects();
-                getRenderQueue()->clear(flushQueue);
-                return;
-        }
-
         // create material for item buffer pass
         InitItemBufferPass();
@@ -752 +752 @@
         //-- (e.g., the visualization mode, the shadow pass)
 
-        if (mUseDepthPass || mShowVisualization ||
+        if (//!mFindVisibleObjects || 
+                mUseDepthPass || mShowVisualization ||
             (mShadowTechnique == SHADOWTYPE_TEXTURE_MODULATIVE && 
              mIlluminationStage == IRS_RENDER_TO_TEXTURE))
@@ -767 +768 @@
                 TerrainSceneManager::_renderVisibleObjects();
 
+                //LogManager::getSingleton().logMessage("x");
                 mIlluminationStage = savedStage;
         }
         else //-- the hierarchical culling algorithm
-        {
+        {//LogManager::getSingleton().logMessage("y");
                 // note matt: this is also called in TerrainSceneManager: really necessary?
                 mDestRenderSystem->setLightingEnabled(false);
@@ -812 +814 @@
                 // set all necessary parameters for 
                 // hierarchical visibility culling and rendering
-                InitVisibilityCulling(mCameraInProgress);
+                InitVisibilityCulling(mDummyCamera);
 
 
@@ -857 +859 @@
         // almost same effect as below
         getRenderQueue()->clear(flushQueue);
-
+        
         if (0) WriteLog(); // write out stats
 }
@@ -864 +866 @@
 void OcclusionCullingSceneManager::_updateSceneGraph(Camera* cam)
 {
-        if (mNormalExecution)
-        {
-                TerrainSceneManager::_updateSceneGraph(cam);
-                return;
-        }
-
-        mVisibilityManager->GetCullingManager()->SetHierarchyInterface(mHierarchyInterface);
-        mHierarchyInterface->SetRenderSystem(mDestRenderSystem);
+        if (!mNormalExecution)
+        {
+                mVisibilityManager->GetCullingManager()->SetHierarchyInterface(mHierarchyInterface);
+                mHierarchyInterface->SetRenderSystem(mDestRenderSystem);
+        }
 
         TerrainSceneManager::_updateSceneGraph(cam);
@@ -1076 +1075 @@
 
                 * static_cast<unsigned int *>(val) = (unsigned int)algorithm;
-
-                //getRenderQueue()->clear();
 
                 return true;
@@ -1913 +1910 @@
                                                                                                 bool includeOverlays)
 {
+        if (0 && mNormalExecution)
+        {
+                TerrainSceneManager::_renderScene(camera, vp, includeOverlays);
+                return;
+        }
+
     Root::getSingleton()._setCurrentSceneManager(this);
         mActiveQueuedRenderableVisitor->targetSceneMgr = this;
@@ -2057 +2060 @@
     {
         // Parse the scene and tag visibles
-        myFindVisibleObjects(camera, 
+        _findVisibleObjects(camera, 
             mIlluminationStage == IRS_RENDER_TO_TEXTURE? true : false);
     }
@@ -2071 +2074 @@
     }
 
- 
+ mDummyCamera = camera;
     // Render scene content 
     _renderVisibleObjects();
@@ -2273 +2276 @@
         // // Render scene content in order fill depth buffer
         bool savedUseDepthPass = mUseDepthPass;
-        mUseDepthPass = true;
+        if (1) mUseDepthPass = true;
 
         // don't need shading, render only depth pass
@@ -2359 +2362 @@
                                                                                                            bool onlyShadowCasters)                                                                               
 {
+        if (1 || mNormalExecution)
+        {
+                TerrainSceneManager::_findVisibleObjects(cam, onlyShadowCasters);
+                return;
+        }
+
         // lists only used for visualization
         mVisible.clear();
@@ -2378 +2387 @@
         OcclusionQueriesQueryManager *queryManager = 
                 new OcclusionQueriesQueryManager(mHierarchyInterface,
-                                                                                 mCurrentViewport,
+                cam->getViewport(),//mCurrentViewport,
                                                                                  queryModes, 
                                                                                  itemBufferMode);

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgrePlatformHierarchyInterface.cpp

@@ -95 +95 @@
         static RenderOperation ro;
 
+        //LogManager::getSingleton().logMessage("here66");
         SolidBoundingBox *solidBox = GetSolidBoundingBox();
         
@@ -106 +107 @@
 
         solidBox->SetupBoundingBoxVertices(*box);
-                                
+
         solidBox->getRenderOperation(ro);
         ro.srcRenderable = solidBox;
+        //std::stringstream d;
+        //d << "vt2: " << ro.vertexData;
+        //LogManager::getSingleton().logMessage(d.str());
+
         mRenderSystem->_render(ro);
 }
@@ -175 +180 @@
 //-----------------------------------------------------------------------
 GtpVisibility::OcclusionQuery *PlatformHierarchyInterface::IssueNodeOcclusionQuery(
-        GtpVisibility::HierarchyNode *node, const bool wasVisible) 
-{
+        GtpVisibility::HierarchyNode *node, 
+        const bool wasVisible) 
+{//LogManager::getSingleton().logMessage("here6960");
         // get next available test id
         GtpVisibility::OcclusionQuery *query = GetNextOcclusionQuery();
@@ -261 +267 @@
 {
         if (!mSolidBoundingBox)
+        {
                 mSolidBoundingBox = new SolidBoundingBox;
+                //LogManager::getSingleton().logMessage("solid box created");
+        }
 
         return mSolidBoundingBox;

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgrePlatformQueryManager.cpp

@@ -12 +12 @@
 //----------------------------------------------------------------------- 
 PlatformQueryManager::PlatformQueryManager(GtpVisibility::HierarchyInterface *hierarchyInterface, 
-                                                                                   Viewport *vp, int queryModes):
+                                                                                   Viewport *vp, 
+                                                                                   int queryModes):
 QueryManager(hierarchyInterface, queryModes), 
 mViewport(vp), 

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreSolidBoundingBox.cpp

@@ -76 +76 @@
          SetOcclusionQueryMaterial();
          //setMaterial("BaseWhiteNoLighting");
+
+        /* std::stringstream d;
+        d << "vtx: " << mRenderOp.vertexData;
+        LogManager::getSingleton().logMessage(d.str());
+        */
+
 }
 //-----------------------------------------------------------------------

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/Plugin_VisibilitySceneManager.vcproj

@@ -52 +52 @@
                         <Tool
                                 Name="VCPostBuildEventTool"
-                                CommandLine="copy $(OutDir)\$(TargetFileName) $(OGRE_PATH)\Samples\Common\bin\$(ConfigurationName)"/>
+                                CommandLine="copy $(OutDir)\$(TargetFileName) $(OGRE_PATH)\Samples\Common\bin\$(ConfigurationName)
+copy $(OutDir)\$(TargetFileName) D:\svn\gametools\GTP\trunk\App\Demos\Illum\Ogre\bin\$(ConfigurationName)"/>
                         <Tool
                                 Name="VCPreBuildEventTool"/>

GTP/trunk/Lib/Vis/OnlineCullingCHC/src/CoherentHierarchicalCullingManager.cpp

@@ -115 +115 @@
                                 // update node's visited flag
                                 mHierarchyInterface->SetLastVisited(node, mHierarchyInterface->GetFrameId());
-
+                                //Ogre::LogManager::getSingleton().logMessage("here999");
                                 // skip testing previously visible nodes without geometry
                                 if (issueQuery)