Changeset 1906

Timestamp:

12/17/06 15:30:08 (17 years ago)

Author:

mattausch

Message:

fixed bug in priority computation of object space

Location:

GTP/trunk/Lib/Vis

Files:

• GtpVisibility.sln (modified) (9 diffs)
• Preprocessing/src/BvHierarchy.cpp (modified) (1 diff)
• Preprocessing/src/RssTree.cpp (modified) (1 diff)

GTP/trunk/Lib/Vis/GtpVisibility.sln

@@ -57 +57 @@
                 Release Internal = Release Internal
                 Release Static = Release Static
+                release_noqt = release_noqt
                 Unicode Debug = Unicode Debug
                 Unicode Release = Unicode Release
@@ -93 +94 @@
                 {935D1BDD-41B0-49F1-A86C-EB49B94DDB20}.Release Static.ActiveCfg = Release|Win32
                 {935D1BDD-41B0-49F1-A86C-EB49B94DDB20}.Release Static.Build.0 = Release|Win32
+                {935D1BDD-41B0-49F1-A86C-EB49B94DDB20}.release_noqt.ActiveCfg = release_noqt|Win32
+                {935D1BDD-41B0-49F1-A86C-EB49B94DDB20}.release_noqt.Build.0 = release_noqt|Win32
                 {935D1BDD-41B0-49F1-A86C-EB49B94DDB20}.Unicode Debug.ActiveCfg = Debug|Win32
                 {935D1BDD-41B0-49F1-A86C-EB49B94DDB20}.Unicode Debug.Build.0 = Debug|Win32
@@ -133 +136 @@
                 {101A7691-74F3-48B4-96A3-CF35578F5900}.Release Static.ActiveCfg = Release|Win32
                 {101A7691-74F3-48B4-96A3-CF35578F5900}.Release Static.Build.0 = Release|Win32
+                {101A7691-74F3-48B4-96A3-CF35578F5900}.release_noqt.ActiveCfg = release_noqt|Win32
+                {101A7691-74F3-48B4-96A3-CF35578F5900}.release_noqt.Build.0 = release_noqt|Win32
                 {101A7691-74F3-48B4-96A3-CF35578F5900}.Unicode Debug.ActiveCfg = Debug|Win32
                 {101A7691-74F3-48B4-96A3-CF35578F5900}.Unicode Debug.Build.0 = Debug|Win32
@@ -173 +178 @@
                 {7319E499-473D-4CE5-9983-725D6E68A55D}.Release Static.ActiveCfg = Release|Win32
                 {7319E499-473D-4CE5-9983-725D6E68A55D}.Release Static.Build.0 = Release|Win32
+                {7319E499-473D-4CE5-9983-725D6E68A55D}.release_noqt.ActiveCfg = release_noqt|Win32
+                {7319E499-473D-4CE5-9983-725D6E68A55D}.release_noqt.Build.0 = release_noqt|Win32
                 {7319E499-473D-4CE5-9983-725D6E68A55D}.Unicode Debug.ActiveCfg = Debug|Win32
                 {7319E499-473D-4CE5-9983-725D6E68A55D}.Unicode Debug.Build.0 = Debug|Win32
@@ -213 +220 @@
                 {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Release Static.ActiveCfg = Release|Win32
                 {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Release Static.Build.0 = Release|Win32
+                {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.release_noqt.ActiveCfg = Release_Internal|Win32
+                {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.release_noqt.Build.0 = Release_Internal|Win32
                 {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Unicode Debug.ActiveCfg = Debug|Win32
                 {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Unicode Debug.Build.0 = Debug|Win32
@@ -253 +262 @@
                 {EABCE292-D598-4600-A1C9-2591E7D62FDA}.Release Static.ActiveCfg = Release|Win32
                 {EABCE292-D598-4600-A1C9-2591E7D62FDA}.Release Static.Build.0 = Release|Win32
+                {EABCE292-D598-4600-A1C9-2591E7D62FDA}.release_noqt.ActiveCfg = release_noqt|Win32
+                {EABCE292-D598-4600-A1C9-2591E7D62FDA}.release_noqt.Build.0 = release_noqt|Win32
                 {EABCE292-D598-4600-A1C9-2591E7D62FDA}.Unicode Debug.ActiveCfg = Debug|Win32
                 {EABCE292-D598-4600-A1C9-2591E7D62FDA}.Unicode Debug.Build.0 = Debug|Win32
@@ -293 +304 @@
                 {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.Release Static.ActiveCfg = Release|Win32
                 {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.Release Static.Build.0 = Release|Win32
+                {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.release_noqt.ActiveCfg = release_noqt|Win32
+                {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.release_noqt.Build.0 = release_noqt|Win32
                 {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.Unicode Debug.ActiveCfg = Debug|Win32
                 {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.Unicode Debug.Build.0 = Debug|Win32
@@ -333 +346 @@
                 {248F19A6-2FE0-4F5D-8928-E0EA10609887}.Release Static.ActiveCfg = Release|Win32
                 {248F19A6-2FE0-4F5D-8928-E0EA10609887}.Release Static.Build.0 = Release|Win32
+                {248F19A6-2FE0-4F5D-8928-E0EA10609887}.release_noqt.ActiveCfg = release_noqt|Win32
+                {248F19A6-2FE0-4F5D-8928-E0EA10609887}.release_noqt.Build.0 = release_noqt|Win32
                 {248F19A6-2FE0-4F5D-8928-E0EA10609887}.Unicode Debug.ActiveCfg = Debug|Win32
                 {248F19A6-2FE0-4F5D-8928-E0EA10609887}.Unicode Debug.Build.0 = Debug|Win32
@@ -373 +388 @@
                 {17F2C6F9-6101-430E-ABF4-71383868EF24}.Release Static.ActiveCfg = Release|Win32
                 {17F2C6F9-6101-430E-ABF4-71383868EF24}.Release Static.Build.0 = Release|Win32
+                {17F2C6F9-6101-430E-ABF4-71383868EF24}.release_noqt.ActiveCfg = release_noqt|Win32
+                {17F2C6F9-6101-430E-ABF4-71383868EF24}.release_noqt.Build.0 = release_noqt|Win32
                 {17F2C6F9-6101-430E-ABF4-71383868EF24}.Unicode Debug.ActiveCfg = Debug|Win32
                 {17F2C6F9-6101-430E-ABF4-71383868EF24}.Unicode Debug.Build.0 = Debug|Win32

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

@@ -643 +643 @@
 
         float priority = EvalPriority(splitCandidate, 
-                                                                  oldRenderCost, 
-                                                                  renderCostDecr);
+                                                                  renderCostDecr,
+                                                                  oldRenderCost);
         
         if (USE_AVGRAYCONTRI)

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

@@ -1459 +1459 @@
   if (stat.rayRefs > mMaxRays) {
         Debug<<"Prunning rays..."<<endl<<flush;
-        PruneRays(0.8f*mMaxRays);
+        PruneRays((int)(0.8f*mMaxRays));
         Debug<<"done."<<endl<<flush;
         //      UpdateTreeStatistics();