Changeset 3258 for GTP/trunk/App

Timestamp:

01/08/09 01:10:53 (16 years ago)

Author:

mattausch

Message:

worked on new method

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• Converter.vcproj (modified) (1 diff)
• FriendlyCulling.vcproj (modified) (2 diffs)
• MainApp.vcproj (modified) (1 diff)
• VisibilitySolutionConverter.vcproj (modified) (2 diffs)
• default.env (modified) (1 diff)
• src/CHCPlusPlusTraverser.cpp (modified) (2 diffs)
• src/FrustumCullingTraverser.cpp (modified) (2 diffs)
• src/OcclusionQuery.h (modified) (2 diffs)
• src/PvsCollectionRenderer.cpp (added)
• src/PvsCollectionRenderer.h (added)
• src/RenderTraverser.cpp (modified) (4 diffs)
• src/RenderTraverser.h (modified) (10 diffs)
• src/ShadowMapping.cpp (modified) (1 diff)
• src/VisibilitySolutionLoader.cpp (modified) (1 diff)
• src/chcdemo.cpp (modified) (7 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/Converter.vcproj

@@ -18 +18 @@
                 <Configuration
                         Name="Debug|Win32"
-                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                        IntermediateDirectory="$(ConfigurationName)"
+                        OutputDirectory="$(SolutionDir)\$(ProjectName)\$(ConfigurationName)"
+                        IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
                         ConfigurationType="1"
                         CharacterSet="1"

GTP/trunk/App/Demos/Vis/FriendlyCulling/FriendlyCulling.vcproj

@@ -335 +335 @@
                                 </File>
                                 <File
+                                        RelativePath=".\src\PvsCollectionRenderer.h"
+                                        >
+                                </File>
+                                <File
                                         RelativePath=".\src\RenderTraverser.h"
                                         >
@@ -411 +415 @@
                                                 />
                                         </FileConfiguration>
+                                </File>
+                                <File
+                                        RelativePath=".\src\PvsCollectionRenderer.cpp"
+                                        >
                                 </File>
                                 <File

GTP/trunk/App/Demos/Vis/FriendlyCulling/MainApp.vcproj

@@ -66 +66 @@
                                 LinkIncremental="2"
                                 AdditionalLibraryDirectories=""lib/$(ConfigurationName)";libs;"$(CG_LIB_PATH)";libs/GL;libs/Devil/lib;libs/Zlib/lib"
+                                IgnoreDefaultLibraryNames="LIBCMT"
                                 GenerateDebugInformation="true"
                                 SubSystem="1"
+                                LargeAddressAware="2"
                                 TargetMachine="1"
                         />

GTP/trunk/App/Demos/Vis/FriendlyCulling/VisibilitySolutionConverter.vcproj

@@ -42 +42 @@
                                 AdditionalOptions=" /D "_CRT_SECURE_NO_WARNINGS""
                                 Optimization="0"
-                                AdditionalIncludeDirectories="libs\Zlib\include"
+                                AdditionalIncludeDirectories="libs\Zlib\include; src"
                                 PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
                                 MinimalRebuild="true"
@@ -63 +63 @@
                         <Tool
                                 Name="VCLinkerTool"
-                                AdditionalDependencies="zlib.lib"
+                                AdditionalDependencies="zlib.lib DemoEngine.lib"
                                 LinkIncremental="2"
-                                AdditionalLibraryDirectories="libs\Zlib\lib"
+                                AdditionalLibraryDirectories="libs\Zlib\lib; lib\$(ConfigurationName)"
                                 IgnoreDefaultLibraryNames="libCMT"
                                 GenerateDebugInformation="true"

GTP/trunk/App/Demos/Vis/FriendlyCulling/default.env

@@ -115 +115 @@
 ## powerplant options
 
-filename=PowerPlantM
+#filename=PowerPlantM
 
-keyForwardMotion=500.0f
-mouseMotion=3.0f
-visibilitySolution=power-plant-2c-xx-1000b-pgv2
-camPosition=-1320.57 -6306.34 3603
-camDirection=0.292156 0.9556 0.0383878
-viewCellsScaleFactor=0.05f
+#keyForwardMotion=500.0f
+#mouseMotion=3.0f
+#visibilitySolution=power-plant-2c-xx-1000b-pgv2
+#camPosition=-1320.57 -6306.34 3603
+#camDirection=0.292156 0.9556 0.0383878
+#viewCellsScaleFactor=0.05f

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/CHCPlusPlusTraverser.cpp

@@ -119 +119 @@
                         mDistanceQueue.pop();
         
-                        if (1 && !IsNodeVisible(node, 10))
+                        if (1 && !IsNodeGeometryVisible(node, 10))
                         {
                                 node->SetVisible(false);
@@ -261 +261 @@
                         newPBatch = 0;
                 else
-                newPBatch *= mVisibilityPredictor.GetProbability(node);
+                        newPBatch *= mVisibilityPredictor.GetProbability(node);
 
                 if (query->GetNodes().empty())

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/FrustumCullingTraverser.cpp

@@ -1 +1 @@
 #include "FrustumCullingTraverser.h"
-#include "SceneEntity.h"
 
 
@@ -18 +17 @@
                 mDistanceQueue.pop();
         
-                if (1 && !IsNodeVisible(node, 10))
+                if (1 && !IsNodeGeometryVisible(node, 10))
                 {
                         node->SetVisible(false);

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/OcclusionQuery.h

@@ -24 +24 @@
 
         virtual ~OcclusionQuery();
-
+        /** Returns true if the query result is available.
+        */
         bool ResultAvailable() const;
-        
+        /** Returns number of visible pixels.
+        */
         unsigned int GetQueryResult() const;
-        
+        /** Starts the query. Everything drawn inbetween start and end is
+                queried.
+        */
         void BeginQuery() const;
-        
+        /** Ends the query.
+        */
         void EndQuery() const;
-        
+        /** Returns id of this query.
+        */
         unsigned int GetQueryId() const;
         /** Returns the first node of the multiquery
         */
         inline BvhNode *GetFrontNode() const { return mNodes[0]; }
+        /** Returns nodes by reference
+        */
         inline const BvhNodeContainer &GetNodes() const { return mNodes; }
-
         /** Reset the list of nodes associated with this query.
         */
@@ -47 +54 @@
         /** Returns the size of the multiquery.
         */
-        inline int GetSize() const { return (int)mNodes.size();}
-        
+        inline int GetSize() const { return (int)mNodes.size(); }
+
+        inline bool IsEmpty() const { return GetSize() == 0; }
+
 
 protected:
-
+        /** Constructor taking an already allocated query id.
+        */
         OcclusionQuery(unsigned int id): mQueryId(id) { }
 

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/RenderTraverser.cpp

@@ -5 +5 @@
 #include "RenderState.h"
 #include "Geometry.h"
+#include "RenderQueue.h"
 #include "Timer/PerfTimer.h"
 
@@ -292 +293 @@
 
 
-bool RenderTraverser::IsNodeVisible(BvhNode *node, int maxSize)
+bool RenderTraverser::IsNodeGeometryVisible(BvhNode *node, int maxSize)
 {
         // no invisible objects
@@ -300 +301 @@
         SceneEntity **entities = mBvh->GetGeometry(node, geometrySize);
 
-        if (geometrySize > maxSize) return true;
+        if ((maxSize != -1) && (geometrySize > maxSize)) return true;
 
         for (int i = 0; i < geometrySize; ++ i)
@@ -311 +312 @@
 
 
-}
+void RenderTraverser::SetCamera(Camera *cam)
+{
+        mCamera = cam;
+}
+
+
+void RenderTraverser::SetRenderQueue(RenderQueue *rq)
+{
+        mRenderQueue = rq;
+}
+
+
+const TraversalStatistics &RenderTraverser::GetStats() const 
+{
+        return mStats; 
+}
+
+
+const SceneEntityContainer &RenderTraverser::GetVisibleObjects() const 
+{
+        return mVisibleObjects; 
+}
+
+
+float RenderTraverser::GetMaxVisibleDistance() const 
+{ 
+        return mMaxVisibleDistance; 
+}
+
+
+Camera *RenderTraverser::GetCamera() const
+{
+        return mCamera; 
+}
+
+
+
+}

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/RenderTraverser.h

@@ -2 +2 @@
 #define __RENDERTRAVERSER_H
 
-#include <queue>
+
 #include "Bvh.h"
 #include "OcclusionQuery.h"
-#include "Camera.h"
-#include "RenderQueue.h"
-#include "Timer/PerfTimer.h"
-
+//#include "Timer/PerfTimer.h"
+#include <queue>
 
 
@@ -14 +12 @@
 {
 
+
 class Camera;
-class Matrix4x4;
-
+class RenderQueue;
 
 
@@ -53 +51 @@
 
         /// types of traversers
-        enum {CULL_FRUSTUM, STOP_AND_WAIT, CHC, CHCPLUSPLUS, NUM_TRAVERSAL_TYPES};
+        enum {CULL_FRUSTUM,
+                  STOP_AND_WAIT, 
+                  CHC, CHCPLUSPLUS, 
+                  CULL_COLLECTOR,
+                  NUM_TRAVERSAL_TYPES};
 
         /** Default constructor.
         */
         RenderTraverser();
-        /** Virtual constructor, has to be redefined in subclasses
+        /** Virtual constructor, has to be redefined in subclasses.
         */
         virtual ~RenderTraverser();
-        /** Abstract method that traverses and renders the scene
+        /** Maim method that traverses and renders the scene.
         */
         void RenderScene();
@@ -78 +80 @@
         /** Sets the camera.
         */
-        void SetCamera(Camera *cam) { mCamera = cam;}
+        void SetCamera(Camera *cam);
         /** Sets the render queue.
         */
-        void SetRenderQueue(RenderQueue *rq) {mRenderQueue =rq;}
-        /** Sets the current render state
+        void SetRenderQueue(RenderQueue *rq);
+        /** Sets the current render state.
         */
         void SetRenderState(RenderState *state);
         /** The traversal statistics
         */
-        const TraversalStatistics &GetStats() const { return mStats; }
+        const TraversalStatistics &GetStats() const;
         /** The current frame id
         */
-        int GetCurrentFrameId() const { return mFrameId; }
+        inline int GetCurrentFrameId() const;
         
+
+
         //////////////////
-        //-- options for the different rendering algorithms
+        //-- methods that concern one or more of the implemented rendering algorithms
 
         /** If a render queue should be used to batch up and sort scene entities before
@@ -107 +111 @@
         void SetVisibilityThreshold(int threshold);
 
+
         ///////////////////
         //-- CHC / CHC ++ related options
+        //-- note: could be implemented more cleanly in a CoherentOcclusionCullingTraverser parent class!
 
         /** CHC optimization to query the geometry itself instead of the bounding box.
@@ -131 +137 @@
             (only if StoreVisibleObjects is set)
         */
-        const SceneEntityContainer &GetVisibleObjects() const { return mVisibleObjects; }
+        const SceneEntityContainer &GetVisibleObjects() const;
         /** Returns the current camera.
         */
-        Camera *GetCamera() const { return mCamera; }
+        Camera *GetCamera() const;
         /** Returns the maximal visible distance encountered in the scene. 
             Useful for e.g., shadow map focussing
         */
-        float GetMaxVisibleDistance() const { return mMaxVisibleDistance; }
-        /** Render also dynamic objects.
+        float GetMaxVisibleDistance() const;
+        /** Render objects declared as dynamic (non-static)
         */
         void SetRenderDynamicObjects(bool dynamic);
@@ -168 +174 @@
         */
         void ApplyRenderQueue();
-
-        bool IsNodeVisible(BvhNode *node, int maxSize);
+        /** Returns true if at least one of the objects in this node are 
+                marked as visible. maxSize describes the maximum sized node 
+                (in # of objects) that is tested. if maxSize is -1, all nodes are tested.
+        */
+        bool IsNodeGeometryVisible(BvhNode *node, int maxSize);
 
 
@@ -189 +198 @@
         /// the statisitcs
         TraversalStatistics mStats;
-        
+        /// the render queue
         RenderQueue *mRenderQueue;
-
         /// the objects found visible in current frame
         SceneEntityContainer mVisibleObjects;
@@ -197 +205 @@
         float mMaxVisibleDistance;
 
+
         /////////////////
         //-- algorithm parameters
@@ -222 +231 @@
 
 
+inline int RenderTraverser::GetCurrentFrameId() const 
+{ 
+        return mFrameId; 
 }
 
 
+}
+
+
 
 #endif // RENDERTRAVERSER_H

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/ShadowMapping.cpp

@@ -7 +7 @@
 #include "Polyhedron.h"
 #include "ResourceManager.h"
+#include "Camera.h"
 
 #include <IL/il.h>

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/VisibilitySolutionLoader.cpp

@@ -155 +155 @@
                         entities = bvh->GetGeometry(node, geometrySize);
 
-                        //if (node->IsLeaf() && (geometrySize != 1))
-                        //if (geometrySize != 1) cout << "Error!! " << geometrySize << endl;
                         for (int k = 0; k < geometrySize; ++ k)
                         {

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.cpp

@@ -60 +60 @@
 #include "VisibilitySolutionLoader.h"
 #include "ViewCellsTree.h"
+#include "PvsCollectionRenderer.h"
 
 
@@ -894 +895 @@
                 tr = new CHCPlusPlusTraverser();
                 break;
-        
+        case RenderTraverser::CULL_COLLECTOR:
+                tr = new PvsCollectionRenderer();
+                break;
         default:
                 tr = new FrustumCullingTraverser();
@@ -1278 +1281 @@
         else
         {
+                if (traverser->GetType() == RenderTraverser::CULL_COLLECTOR)
+                        ((PvsCollectionRenderer *)traverser)->SetViewCell(usePvs ? viewCell : NULL);
+
                 // actually render the scene geometry using the specified algorithm
                 traverser->RenderScene();
@@ -1423 +1429 @@
         case 32: // space
                 renderMode = (renderMode + 1) % RenderTraverser::NUM_TRAVERSAL_TYPES;
+                //renderMode = (renderMode + 1) % 4;
 
                 DEL_PTR(traverser);
@@ -2312 +2319 @@
 
                 glColor3f(1.0f, 1.0f, 1.0f);
-                static char *alg_str[] = {"Frustum Cull", "Stop and Wait", "CHC", "CHC ++"};
+                static char *alg_str[] = {
+                        "Frustum Cull"
+                        , "Stop and Wait"
+                        , "CHC"
+                        , "CHC ++"
+                        , "Collector"
+                };
                 
                 if (!showAlgorithmTime)
@@ -2393 +2406 @@
                 renderQueue->Enqueue(*sit);
         }
+
         /// now render out everything in one giant pass
         renderQueue->Apply();
@@ -2407 +2421 @@
 {
         if (!sceneQuery)
+        {
                 sceneQuery = new SceneQuery(bvh->GetBox(), traverser, &renderState);
+        }
 
         return sceneQuery;