Changeset 3052 for GTP/trunk/App/Demos

Timestamp:

10/21/08 03:55:43 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• FriendlyCulling.vcproj (modified) (1 diff)
• src/Bvh.cpp (modified) (1 diff)
• src/BvhLoader.cpp (modified) (1 diff)
• src/RenderState.h (modified) (1 diff)
• src/ResourceManager.cpp (modified) (4 diffs)
• src/ResourceManager.h (modified) (4 diffs)
• src/chcdemo.cpp (modified) (6 diffs)

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

@@ -112 +112 @@
                                 EnableFiberSafeOptimizations="true"
                                 AdditionalIncludeDirectories="libs;libs/GL;libs/Devil/include;src;libs/Zlib/include;"$(CG_INC_PATH)""
-                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
+                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SET"
                                 StringPooling="true"
                                 RuntimeLibrary="2"

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

@@ -402 +402 @@
 void Bvh::UpdateDistance(BvhNode *node) const
 {
+        // use distance to center rather than the distance to the near plane because
+        // otherwise problems with big object penetrating the near plane 
+        // (e.g., big objects in the distance which are then always visible)
+        // especially annoying is this problem when using the frustum 
+        // fitting on the visible objects for shadow mapping
+
         //node->mDistance = node->GetBox()GetMinDistance(sNearPlane);
         node->mDistance = sNearPlane.Distance(node->GetBox().Center());

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

@@ -76 +76 @@
         BvhNode *root = LoadNextNode(stream, NULL);
 
-#if 1
+#if 0
 
         bvh->mRoot = root;
 
 #else
-        // copy root and set new one for dynamic objects
+        // we are setting a new root node
+        // which adds one level of indirection to the bvh but 
+        // allows us to use dynamic objects
+        // the new bvh has two main branches
+        // one is the static branch (the old root),
+        // one is the dynamic branch 
+        // we create a 'dynamic' leaf which basically is a container
+        // for all dynamic objects underneath
+        // the bounding boxes of the dynamic tree must be updated
+        // once each frame in order to be able to incorporate
+        // the movements of the objects within
+
         BvhInterior *newRoot = new BvhInterior(NULL);
-        
+        bvh->mRoot = newRoot;
+
+        BvhLeaf *dynamicLeaf = new BvhLeaf(newRoot);
+
+        newRoot->mFront = root;
+        newRoot->mBack = dynamicLeaf;
+        root->mParent = newRoot;
+
+        // the separation is a purely logical one
+        // the bounding boxes of the child nodes is the
+        // same as for the root node
         newRoot->mBox = root->mBox;
+        dynamicLeaf->mBox = root->mBox;
+
+        newRoot->mArea = newRoot->mBox.SurfaceArea();
+        dynamicLeaf->mArea = dynamicLeaf->mBox.SurfaceArea();
+
         newRoot->mFirst = root->mFirst;
         newRoot->mLast = root->mLast;
 
-        // create 'dynamic' leaf which basically is a container
-        // for all dynamic objects
-        BvhLeaf *dynamicLeaf = new BvhLeaf(newRoot);
-        dynamicLeaf->mBox = root->mBox;
-
-        newRoot->mFront = root;
-        root->mParent = newRoot;
-
-        newRoot->mBack = dynamicLeaf;
-
-        bvh->mRoot = newRoot;
+        dynamicLeaf->mFirst = 0;
+        dynamicLeaf->mLast = 0;
 #endif
 
-        tQueue.push(bvh->mRoot);
+        tQueue.push(root);
         bvh->mNumNodes = 1;
 

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

@@ -36 +36 @@
         */
         RenderState();
-        
-        ~RenderState() { Reset(); };
         /** This must be called each time before and after an occlusion test.
                 Mode is one of render mode or query mode. Returns true if a state

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

@@ -91 +91 @@
 
 
+void ResourceManager::DelSingleton()
+{
+        DEL_PTR(sResourceManager);
+}
+
+
 SceneEntity *ResourceManager::LoadSceneEntity(igzstream &str)
 {       
@@ -431 +437 @@
 
 
-
 ShaderProgram *ResourceManager::CreateFragmentProgram(const std::string &filename, 
                                                                                                           const std::string &funcName)
@@ -438 +443 @@
 
         ShaderProgram *p = new ShaderProgram(sCgContext, fullName, sCgFragmentProfile, funcName);
-
         mShaders.push_back(p);
 
@@ -465 +469 @@
                 cerr << "Program " << funcName << " in " << fullName << " failed to load" << endl;
         }
-        
-        cout << "Program " << funcName << " in " << fullName << " loaded" << endl;
+        else
+                cout << "Program " << funcName << " in " << fullName << " loaded" << endl;
 
         return p;

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

@@ -32 +32 @@
 public:
 
-        /** Returns the resource manager as a singleton.
-        */
-        static ResourceManager *GetSingleton()
-        {
-                if (!sResourceManager)
-                {
-                        sResourceManager = new ResourceManager();
-                }
-
-                return sResourceManager;
-        }
-
-        /** We also want full control over the delete.
-        */
-        static void DelSingleton()
-        {
-                DEL_PTR(sResourceManager);
-        }
-
         /** Loads a model
         */
         bool Load(const std::string &filename, SceneEntityContainer &geometry);
-
+        /** Returns number of scene entities loaded with this manager.
+        */
         int GetNumEntities() const { return (int)mSceneEntities.size(); }
-
         /** Creates new gpu program parameters.
         */
@@ -71 +52 @@
         void DisableVertexProfile();
 
+        /** Returns the resource manager as a singleton.
+        */
+        inline static ResourceManager *GetSingleton();
+        /** We also want full control over the delete.
+        */
+        static void DelSingleton();
 
 protected:
@@ -111 +98 @@
         LODContainer mLODs;
 
-        ////////
-
         /// the scene entities
-
         SceneEntityContainer mSceneEntities;
 
@@ -132 +116 @@
 
 
+ResourceManager *ResourceManager::GetSingleton()
+{
+        if (!sResourceManager)
+                sResourceManager = new ResourceManager();
+        
+        return sResourceManager;
+}
+
+
 }
 #endif

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

@@ -95 +95 @@
 
 int assumedVisibleFrames = 10;
-
 int maxBatchSize = 50;
-
 int trianglesPerVirtualLeaf = INITIAL_TRIANGLES_PER_VIRTUAL_LEAVES;
-
 SceneQuery *sceneQuery = NULL;
 RenderQueue *renderQueue = NULL;
-
 // traverses and renders the hierarchy
 RenderTraverser *shadowTraverser = NULL;
@@ -291 +287 @@
 int main(int argc, char* argv[])
 {
-/*
 #ifdef _CRT_SET
 
@@ -304 +299 @@
         _CrtSetReportFile(_CRT_ASSERT,_CRTDBG_FILE_STDERR); 
 #endif
-*/
+
         cout << "=== reading environment file ===" << endl << endl;
 
@@ -470 +465 @@
         {
                 cerr << "loading file " << skyDomeStr << " failed" << endl;
-
                 CleanUp();
                 exit(0);
@@ -1094 +1088 @@
                 CleanUp();
                 exit(0);
-                break;
         case 32: // space
                 renderMode = (renderMode + 1) % RenderTraverser::NUM_TRAVERSAL_TYPES;
@@ -1649 +1642 @@
         DEL_PTR(shadowMap);
         DEL_PTR(shadowTraverser);
-        
+
         ResourceManager::DelSingleton();
         loader = NULL;