Changeset 2183 for GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE

Timestamp:

03/02/07 13:13:24 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE

Files:

• include/OgreMeshInstance.h (modified) (1 diff)
• include/OgreOcclusionCullingSceneManager.h (modified) (4 diffs)
• src/OgreMeshInstance.cpp (modified) (1 diff)
• src/OgreOcclusionCullingSceneManager.cpp (modified) (5 diffs)
• src/OgreOcclusionQueriesQueryManager.cpp (modified) (2 diffs)
• src/Plugin_VisibilitySceneManager.vcproj (modified) (3 diffs)

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

@@ -52 +52 @@
                                                    GtpVisibilityPreprocessor::Vector3 &normal);
 
-        ostream &Describe(ostream &s);
+        std::ostream &Describe(std::ostream &s);
         
 

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

@@ -13 +13 @@
 #include "Containers.h"
 #include "ViewCellsManager.h"
+#include "VisibilityInfo.h"
 
 
@@ -20 +21 @@
 
 class ObjReader;
+
 
 namespace Ogre {
@@ -126 +128 @@
         void RenderDepthForQuery(Camera* camera, Viewport* vp);
 
+        void _findVisibleObjects(Camera* cam, bool onlyShadowCasters);
+
 protected:
         
@@ -191 +195 @@
                                                                 const bool fromPoint,
                                                                 const bool nodeVisibility);     
+
+        void AddVisibleMeshGeometryToQueue(const GtpVisibility::MeshInfoContainer &visibleGeometry, Camera *cam);
+        void AddVisibleNodeGeometryToQueue(const GtpVisibility::NodeInfoContainer &visibleNodes, Camera *cam);
 
         //////////////////////////////////////////

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

@@ -74 +74 @@
         }
 
-        ostream &OgreMeshInstance::Describe(ostream &s)
+        std::ostream &OgreMeshInstance::Describe(std::ostream &s)
         {
                 s << mEntity;

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

@@ -25 +25 @@
 #include "ObjReader.h"
 #include "OgreOcclusionQueriesQueryManager.h"
+#include "VisibilityInfo.h"
+#include "Preprocessor.h"
 
 
@@ -706 +708 @@
 
         // standard rendering in first pass
-        if (!mNormalExecution && mUseDepthPass)
+        // hierarchical culling interleaves identification 
+        // and rendering of objects in _renderVisibibleObjects
+
+        // for the shadow pass we use only standard rendering
+        // because shadows have low occlusion anyway
+        if ((mShadowTechnique == SHADOWTYPE_TEXTURE_MODULATIVE && 
+                 mIlluminationStage == IRS_RENDER_TO_TEXTURE) ||
+                mNormalExecution)
+        {
+                OctreeSceneManager::_findVisibleObjects(cam, onlyShadowCasters);
+        }
+        else if (mUseDepthPass)
         {
                 RenderDepthPass();
         }
-        else
-        {
-                // hierarchical culling interleaves identification 
-                // and rendering of objects in _renderVisibibleObjects
-
-                // for the shadow pass we use only standard rendering
-                // because shadows have low occlusion anyway
-                if ((mShadowTechnique == SHADOWTYPE_TEXTURE_MODULATIVE && 
-                         mIlluminationStage == IRS_RENDER_TO_TEXTURE) ||
-                        mNormalExecution)
-                {
-                        OctreeSceneManager::_findVisibleObjects(cam, onlyShadowCasters);
-                }
-
-                // only shadow casters will be rendered in shadow texture pass
-                //if (0) mHierarchyInterface->SetOnlyShadowCasters(onlyShadowCasters);
-        }
+        
+        // only shadow casters will be rendered in shadow texture pass
+        //if (0) mHierarchyInterface->SetOnlyShadowCasters(onlyShadowCasters);
 }
 //-----------------------------------------------------------------------
@@ -1087 +1086 @@
                         return false;
 
-                const bool fromPoint = true;
+                const bool fromPoint = false;
                 const bool nodeVisibility = true;
                 
@@ -1397 +1396 @@
         
         // possible two cameras (one for culling, one for rendering)
-        mHierarchyInterface->InitTraversal(mCameraInProgress, 
+        mHierarchyInterface->InitTraversal(cam, 
                                                                            mCullCamera ? getCamera("CullCamera") : NULL,
                                                                            mLeavePassesInQueue);
@@ -2311 +2310 @@
 }
 //-----------------------------------------------------------------------
+void OcclusionCullingSceneManager::AddVisibleMeshGeometryToQueue(const GtpVisibility::MeshInfoContainer &visibleGeometry,
+                                                                                                                                 Camera *cam)
+{
+        GtpVisibility::MeshInfoContainer::const_iterator geomIt, geomIt_end = visibleGeometry.end();
+
+        for (geomIt = visibleGeometry.begin(); geomIt != geomIt_end; ++geomIt)
+        {
+                MovableObject *mo = (*geomIt).GetSource();
+
+                // add if not 0
+                if (!(*geomIt).GetVisiblePixels())
+                        continue;
+
+                mo->_notifyCurrentCamera(cam);
+
+                if (mo->isVisible())
+                {
+                        mo->_updateRenderQueue(getRenderQueue());
+                }
+        }
+}
+//-----------------------------------------------------------------------
+void OcclusionCullingSceneManager::AddVisibleNodeGeometryToQueue(const GtpVisibility::NodeInfoContainer &visibleNodes,
+                                                                                                                                 Camera *cam)
+{
+        ////////////////
+        //-- apply queries on node level
+
+        GtpVisibility::NodeInfoContainer::const_iterator nodesIt, nodesIt_end = visibleNodes.end();
+
+        for (nodesIt = visibleNodes.begin(); nodesIt != nodesIt_end; ++ nodesIt)
+        {
+                if (!(*nodesIt).GetVisiblePixels())
+                        continue;
+
+                Octree *octree = static_cast<Octree *>((*nodesIt).GetSource());
+
+                NodeList::iterator nIt, nIt_end = octree->mNodes.end();
+
+                for (nIt = octree->mNodes.begin(); nIt != nIt_end; ++ nIt)
+                {
+                        (*nIt)->_addToRenderQueue(cam, getRenderQueue(), false);
+                }
+        }
+}
+//-----------------------------------------------------------------------
+void OcclusionCullingSceneManager::_findVisibleObjects(Camera* cam,
+                                                                                                           bool onlyShadowCasters)                                                                               
+{
+        // lists only used for visualization
+        mVisible.clear();
+        mBoxes.clear();
+
+        const bool fromPoint = false;
+        const bool nodeVisibility = false;
+
+        const int itemBufferMode = 0;
+        const bool relativeVisibility = false;
+
+        int queryModes = 0;
+
+        if (nodeVisibility)
+                queryModes |= GtpVisibility::QueryManager::NODE_VISIBILITY;
+        else
+                queryModes |= GtpVisibility::QueryManager::GEOMETRY_VISIBILITY;
+
+        OcclusionQueriesQueryManager *queryManager = 
+                new OcclusionQueriesQueryManager(mHierarchyInterface,
+                                                                                 mCurrentViewport,
+                                                                                 queryModes, 
+                                                                                 itemBufferMode);
+
+        mVisibilityManager->SetQueryManager(queryManager);
+
+        GtpVisibility::NodeInfoContainer visibleNodes;
+        GtpVisibility::MeshInfoContainer visibleGeometry;
+        GtpVisibility::PatchInfoContainer visiblePatches;
+
+        if (fromPoint)
+        {
+                queryManager->ComputeFromPointVisibility(cam->getDerivedPosition(), 
+                                                                                                 &visibleNodes, 
+                                                                                                 &visibleGeometry, 
+                                                                                                 &visiblePatches, 
+                                                                                                 relativeVisibility);
+        }
+        else
+        {
+                queryManager->ComputeCameraVisibility(*cam,
+                                                                                          &visibleNodes, 
+                                                                                          &visibleGeometry, 
+                                                                                          &visiblePatches, 
+                                                                                          relativeVisibility);
+        }
+                
+        if (0)
+        {
+                std::stringstream d; 
+                d << "Query mode: " << queryModes 
+                  << " visible nodes: " << (int)visibleNodes.size() 
+                  << " visible geometry: " << (int)visibleGeometry.size();
+
+                LogManager::getSingleton().logMessage(d.str());
+        }
+
+        ///////////////////////
+        //-- put items in render queue
+        //////////
+
+        //getRenderQueue()->clear();
+
+        //////////////////////
+        //-- apply queries on geometry level
+
+        if (!nodeVisibility)
+        {
+                AddVisibleMeshGeometryToQueue(visibleGeometry, cam);
+        }
+        else
+        {
+                AddVisibleNodeGeometryToQueue(visibleNodes, cam);
+        }
+                
+        delete queryManager;
+}
+
+//-----------------------------------------------------------------------
 void OcclusionCullingSceneManagerFactory::destroyInstance(SceneManager* instance)
 {

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

@@ -168 +168 @@
         {
                 //-- queries for hierarchy nodes
-                for (nodeIt = nodeList.begin(); nodeIt != nodeIt_end; ++nodeIt)         
+                for (nodeIt = nodeList.begin(); nodeIt != nodeIt_end; ++ nodeIt)                
                 {
                         // TODO: DELETE QUERIES FROM PREVIOUS RENDER
-                        queryList[i].push_back(mHierarchyInterface->IssueNodeOcclusionQuery(*nodeIt, false));
+                        bool intersects = false;
+
+                        pfHierarchyInterface->CheckFrustumVisible(*nodeIt, intersects);
+
+                        // always push back if intersects
+                        if (1 && intersects)
+                        {
+                                // no more information available
+                                const int visPixels = 1;
+                                const int projPixels = 1;
+
+                                visibleNodes->push_back(GtpVisibility::NodeInfo(*nodeIt, visPixels, projPixels));
+                                queryList[i].push_back(NULL);
+                        }
+                        else
+                        {
+                                queryList[i].push_back(mHierarchyInterface->IssueNodeOcclusionQuery(*nodeIt, false));
+                        }
                 }
 
@@ -300 +317 @@
         for (nodeIt = nodeList->begin(); nodeIt != nodeList->end(); ++ nodeIt)
         {
+                if (!(*visQueryIt))
+                {
+                        ++ visQueryIt;
+                        if (relativeVisibility)
+                                ++ projQueryIt;
+                        continue;
+                }
+
                 unsigned int visiblePixels = 0;
                 (*visQueryIt)->GetQueryResult(visiblePixels, true);

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

@@ -21 +21 @@
                                 Optimization="0"
                                 AdditionalIncludeDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\include";"$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\Dependencies\include\CEGUI";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include";"$(OGRE_PATH)\OgreMain\include";"$(OGRE_PATH)\Dependencies\include";..\include;..\..\..\OnlineCullingCHC\include;..\..\..\Preprocessing\src;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\ObjReader\include;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\include;..\..\..\Preprocessing\src\Timer"
-                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PLUGIN_KD_TERRAIN_EXPORTS;GTP_VISIBILITY_MODIFIED_OGRE"
+                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PLUGIN_KD_TERRAIN_EXPORTS;GTP_VISIBILITY_MODIFIED_OGRE;GAMETOOLS_ILLUMINATION_MODULE"
                                 MinimalRebuild="TRUE"
                                 BasicRuntimeChecks="3"
@@ -90 +90 @@
                                 OptimizeForWindowsApplication="TRUE"
                                 AdditionalIncludeDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\include";"$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\Dependencies\include\CEGUI";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include";"$(OGRE_PATH)\OgreMain\include";"$(OGRE_PATH)\Dependencies\include";..\include;..\..\..\OnlineCullingCHC\include;..\..\..\Preprocessing\src;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\include;..\..\..\Preprocessing\src\Timer;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\ObjReader\include"
-                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PLUGIN_KD_TERRAIN_EXPORTS;GTP_VISIBILITY_MODIFIED_OGRE;GAMETOOLS_ILLUMINATION_MODULE1"
+                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PLUGIN_KD_TERRAIN_EXPORTS;GTP_VISIBILITY_MODIFIED_OGRE;GAMETOOLS_ILLUMINATION_MODULE"
                                 StringPooling="TRUE"
                                 RuntimeLibrary="2"
@@ -320 +320 @@
                                 AdditionalLibraryDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\Release";"$(OGRE_PATH)\OgreMain\lib\Release";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";..\..\GtpVisibility\lib\Release;..\..\lib\Release;..\lib\Release;"$(OGRE_PATH)\Dependencies\lib\Release";..\..\..\Preprocessing\lib\Release;..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\Preprocessing\src\GL;"$(CG_LIB_PATH)";..\..\..\..\..\..\..\NonGTP\Zlib\lib;..\..\..\..\..\Lib\Vis\Preprocessing\MultiLevelRayTracing\RTWorld\Release;..\..\..\..\..\Lib\Vis\Preprocessing\MultiLevelRayTracing\RTScene\Release;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\lib\Release;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\ObjReader\lib\Release"
                                 ModuleDefinitionFile="..\misc\OgreVisibilitySceneManager.def"
-                                GenerateDebugInformation="FALSE"
+                                GenerateDebugInformation="TRUE"
                                 SubSystem="2"
                                 OptimizeReferences="2"