Changeset 3257

Timestamp:

01/07/09 15:12:29 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• default.env (modified) (3 diffs)
• src/ViewCellsTree.cpp (modified) (6 diffs)
• src/ViewCellsTree.h (modified) (2 diffs)
• src/VisibilitySolutionLoader.cpp (modified) (3 diffs)
• src/VisibilitySolutionLoader.h (modified) (1 diff)
• src/chcdemo.cpp (modified) (2 diffs)

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

@@ -21 +21 @@
 
 # if using pvs, this specifies the name of the visibility solutin
-#visibilitySolution=vienna_full-8x3-refu
 visibilitySolution=vienna_full-8x3-pgv
 viewCellsScaleFactor=1.0f
@@ -58 +57 @@
 lightDirection=-0.3f 0.2f -0.7f
 
-###########################
-## powerplant options
-
-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
 
 #####################
@@ -122 +110 @@
 # ssao filter radius
 ssaoFilterRadius=12.0f
+
+
+###########################
+## powerplant options
+
+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

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

@@ -38 +38 @@
 
 
-bool ViewCellsTree::LoadFromFile(const std::string &filename)
+bool ViewCellsTree::LoadFromFile(const std::string &filename, float scaleFactor)
 {
         cout << "Loading view cells from file '" + filename + "'";
@@ -50 +50 @@
         }
 
-        bool result = _LoadFromFile(fr);
+        bool result = _LoadFromFile(fr, scaleFactor);
 
         cout << "finished loading view cells. " << endl;
@@ -59 +59 @@
 
 
-bool ViewCellsTree::_LoadFromFile(FILE *fr)
+bool ViewCellsTree::_LoadFromFile(FILE *fr, float scaleFactor)
 {
         int buffer[256]; 
@@ -81 +81 @@
         fread(&box, sizeof(AxisAlignedBox3), 1, fr);
 
-        box.Scale(mScaleFactor);
+        box.Scale(scaleFactor);
 
         Vector3 v1(box.Min().x, -box.Min().z, box.Min().y);
@@ -124 +124 @@
                         fread(&mypos, sizeof(float), 1, fr);
 
-                        mypos *= mScaleFactor;
+                        mypos *= scaleFactor;
 
                         // changed coordinate system must be considered also here
@@ -145 +145 @@
         }
 
-        cout << "\nloaded " << numViewCells << " view cells" << " " << axes[0] << " " << axes[1] << " " << axes[2] << endl;
         return true;
 }
 
 
-void ViewCellsTree::SetScaleFactor(float scale)
-{
-        mScaleFactor = scale;
-}
-
 
 }

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

@@ -83 +83 @@
 
         ViewCell *GetViewCell(const Vector3 &point) const;
-
-        bool LoadFromFile(const std::string &filename);
+        
         /** Hack: Sometimes the scene has to be scaled, then also
                 the view cells must be scaled accordingly.
         */
-        void SetScaleFactor(float scale);
-
+        bool LoadFromFile(const std::string &filename, float scaleFactor = 1.0f);
+        
 
 protected:
 
-        bool _LoadFromFile(FILE *file);
+        bool _LoadFromFile(FILE *file, float scaleFactor);
 
 
@@ -101 +100 @@
         AxisAlignedBox3 mBox;
         ViewCellsTreeNode *mRoot;
-        float mScaleFactor;
 };
 

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

@@ -16 +16 @@
 
 ViewCellsTree *VisibilitySolutionLoader::Load(const std::string &filename,
-                                                                                          Bvh *bvh)
+                                                                                          Bvh *bvh,
+                                                                                          float viewCellsScaleFactor)
 {
         FILE *fr = fopen(filename.c_str(), "rb");
@@ -38 +39 @@
         ViewCellsTree *viewCellsTree = new ViewCellsTree();
 
-        bool ok = viewCellsTree->_LoadFromFile(fr);
+        bool ok = viewCellsTree->_LoadFromFile(fr, viewCellsScaleFactor);
 
         cout << "finished loading view cells" << endl;
@@ -226 +227 @@
         }
 
-        cout << "#of viewcells = " << id << " " << axes[0] << " " << axes[1] << " " << axes[2] << endl;
-}
-
-
-}
+        cout << "loaded " << id << " view cells" << endl;
+}
+
+
+}

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

@@ -23 +23 @@
         VisibilitySolutionLoader(): mNumNodes(0) {};
 
-        ViewCellsTree *Load(const std::string &filename, Bvh *bvh);
+        ViewCellsTree *Load(const std::string &filename, Bvh *bvh, float viewCellsScaleFactor = 1.0f);
 
 

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

@@ -1196 +1196 @@
                 if (!viewCellsTree)     LoadVisibilitySolution();
 
-                if (viewCellsTree)
-                {
-                        viewCellsTree->SetScaleFactor(viewCellsScaleFactor);
-                        LoadPvs();
-                }
+                if (viewCellsTree) LoadPvs();
         }
 
@@ -2611 +2607 @@
         VisibilitySolutionLoader visLoader;
 
-        viewCellsTree = visLoader.Load(vis_filename, bvh);
+        viewCellsTree = visLoader.Load(vis_filename, bvh, viewCellsScaleFactor);
 
         if (!viewCellsTree)