Changeset 1359

Timestamp:

09/13/06 18:03:30 (18 years ago)

Author:

mattausch

Message:

worked on global object sorting

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• BvHierarchy.cpp (modified) (3 diffs)
• Environment.cpp (modified) (2 diffs)
• Preprocessor.cpp (modified) (1 diff)
• VssTree.cpp (modified) (2 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.cpp

@@ -227 +227 @@
                 "BvHierarchy.Construction.renderCostDecreaseWeight", mRenderCostDecreaseWeight);
         
-        Environment::GetSingleton()->GetBoolValue("BvHierarchy.useGlobalSort", mUseGlobalSorting);
-
-
-        ///////////////////
+        Environment::GetSingleton()->GetBoolValue("BvHierarchy.Construction.useGlobalSorting", mUseGlobalSorting);
+
+
+        /////////////////////////////////
         //-- debug output
+
         Debug << "******* Bvh hierarchy options ******** " << endl;
     Debug << "max depth: " << mTermMaxDepth << endl;
@@ -1153 +1154 @@
         Debug << "\nbvh render cost\n" 
                   << "back p: " << pBack / viewSpaceVol << " front p " << pFront / viewSpaceVol << endl
-                  << "new rc: " << newRenderCost / viewSpaceVol << endl;*/
+                  << "new rc: " << newRenderCost / viewSpaceVol << endl;
 #endif
-
         return newRenderCost;
 }
@@ -1596 +1596 @@
         for (int i = 0; i < 3; ++ i)
         {
+                frontData.mSortedObjects[i] = new ObjectContainer();
+                backData.mSortedObjects[i] = new ObjectContainer();
+
                 frontData.mSortedObjects[i]->reserve((int)sc.mFrontObjects.size());
                 backData.mSortedObjects[i]->reserve((int)sc.mFrontObjects.size());

GTP/trunk/Lib/Vis/Preprocessing/src/Environment.cpp

@@ -2390 +2390 @@
                                    "bvh_construction_render_cost_decrease_weight=",
                                    "0.99");
-
-
-/*******************************************************************/
-/*               Hierarchy Manager related options                 */
-/*******************************************************************/
+        
+        RegisterOption("BvHierarchy.Construction.useGlobalSorting",
+                                        optBool,
+                                        "bvh_construction_use_global_sorting=",
+                                        "false");
+
+        
+        /*******************************************************************/
+        /*               Hierarchy Manager related options                 */
+        /*******************************************************************/
 
         RegisterOption("Hierarchy.subdivisionStats",
@@ -2435 +2440 @@
                                         "hierarchy_construction_repair_queue=",
                                         "true");
+
 
         //////////////////////////////////////////////////////////////////////////////////

GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp

@@ -1006 +1006 @@
                                                                   )
 {
-  cout << "internal ray" << endl;
+  //cout << "internal ray" << endl;
   int hits = 0;
   static Ray ray;

GTP/trunk/Lib/Vis/Preprocessing/src/VssTree.cpp

@@ -280 +280 @@
     delete root;
         
-  root = new VssTreeLeaf(NULL, rays.size());
+  root = new VssTreeLeaf(NULL, (int)rays.size());
   // first construct a leaf that will get subdivide
   VssTreeLeaf *leaf = (VssTreeLeaf *) root;
@@ -321 +321 @@
   cout<<"Dirr Bbox = "<<dirBBox<<endl;
 
-  stat.rays = leaf->rays.size();
+  stat.rays = (int)leaf->rays.size();
   leaf->UpdatePvsSize();
   leaf->ComputeEntropyImportance();