Changeset 3256

Timestamp:

01/07/09 14:22:34 (15 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• default.env (modified) (2 diffs)
• src/ViewCellsTree.cpp (modified) (4 diffs)
• src/ViewCellsTree.h (modified) (2 diffs)
• src/chcdemo.cpp (modified) (5 diffs)

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

@@ -23 +23 @@
 #visibilitySolution=vienna_full-8x3-refu
 visibilitySolution=vienna_full-8x3-pgv
-
-useSkylightForIllum=!
+viewCellsScaleFactor=1.0f
+useSkylightForIllum=1
 
 
@@ -61 +61 @@
 ## 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
-
+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

@@ -13 +13 @@
 
 #define VIEWCELLS_VERSION 1.0f
-
-// hack: this has to be set to 0.05f for powerplant, to 1 otherwise
-//static const float sScale = 0.05f;
-static const float sScale = 1.0f;
 
 
@@ -85 +81 @@
         fread(&box, sizeof(AxisAlignedBox3), 1, fr);
 
-        box.Scale(sScale);
+        box.Scale(mScaleFactor);
 
         Vector3 v1(box.Min().x, -box.Min().z, box.Min().y);
@@ -128 +124 @@
                         fread(&mypos, sizeof(float), 1, fr);
 
-                        mypos *= sScale;
+                        mypos *= mScaleFactor;
 
                         // changed coordinate system must be considered also here
@@ -154 +150 @@
 
 
+void ViewCellsTree::SetScaleFactor(float scale)
+{
+        mScaleFactor = scale;
 }
+
+
+}

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

@@ -85 +85 @@
 
         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);
 
 
@@ -97 +101 @@
         AxisAlignedBox3 mBox;
         ViewCellsTreeNode *mRoot;
+        float mScaleFactor;
 };
 

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

@@ -265 +265 @@
 
 int sCurrentMrtSet = 0;
-
 static Matrix4x4 invTrafo = IdentityMatrix();
-
 float mouseMotion = 0.2f;
+
+float viewCellsScaleFactor = 1.0f;
 
 
@@ -457 +457 @@
 
                 env.GetBoolParam(string("usePvs"), usePvs);
-
                 env.GetBoolParam(string("useSkylightForIllum"), useSkylightForIllum);
+                env.GetFloatParam(string("viewCellsScaleFactor"), viewCellsScaleFactor);
 
                 //env.GetStringParam(string("modelPath"), model_path);
@@ -492 +492 @@
                 cout << "use PVSs: " << usePvs << endl;
                 cout << "visibility solution: " << visibilitySolution << endl;
+                cout << "view cells scale factor: " << viewCellsScaleFactor << endl;
                 cout << "use skylight for illumination: " << useSkylightForIllum << endl;
 
@@ -523 +524 @@
 
         SceneEntity::SetUseLODs(useLODs);
+
 
         if (!useFullScreen)
@@ -1192 +1194 @@
         if (1 && usePvs)
         {
-                if (!viewCellsTree) LoadVisibilitySolution();
-                LoadPvs();
+                if (!viewCellsTree)     LoadVisibilitySolution();
+
+                if (viewCellsTree)
+                {
+                        viewCellsTree->SetScaleFactor(viewCellsScaleFactor);
+                        LoadPvs();
+                }
         }