Changeset 1733

Timestamp:

11/09/06 13:57:27 (18 years ago)

Author:

mattausch

Message:

removed bug from dirtycandidates

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• BvHierarchy.cpp (modified) (1 diff)
• HierarchyManager.cpp (modified) (3 diffs)
• SubdivisionCandidate.h (modified) (2 diffs)
• TestPreprocessor.vcproj (modified) (1 diff)
• VspTree.cpp (modified) (1 diff)

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

@@ -1852 +1852 @@
                 {
                         candidate->Mail();
+                        candidate->SetDirty(true);
                         dirtyList.push_back(candidate);
                 }

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

@@ -267 +267 @@
         splitQueue.Pop();
 
+        // split was not reevaluated before => do it now
+        if (splitCandidate->IsDirty())
+                splitCandidate->EvalCandidate();
+
         return splitCandidate;
 }
@@ -471 +475 @@
         {
                 // decide upon next split type
-                if (viewSpaceQueue.Top()->IsDirty())
-                        viewSpaceQueue.Top()->EvalCandidate();
-
-                if (objectSpaceQueue.Top()->IsDirty())
-                        objectSpaceQueue.Top()->EvalCandidate();
-
                 const float vspPriority = viewSpaceQueue.Top() ? viewSpaceQueue.Top()->GetPriority() : -1e20f;
                 const float ospPriority = objectSpaceQueue.Top() ? objectSpaceQueue.Top()->GetPriority() : -1e20f;
@@ -976 +974 @@
         while (!splitQueue.Empty())
         {
-                // reevaluate current candidate
-                if (splitQueue.Top()->IsDirty())
-                        splitQueue.Top()->EvalCandidate();
-                
                 const float priority = splitQueue.Top()->GetPriority();
                 const float threshold = oldCandidate ? oldCandidate->GetPriority() : 1e20f;

GTP/trunk/Lib/Vis/Preprocessing/src/SubdivisionCandidate.h

@@ -98 +98 @@
         }
 
+        inline void SetDirty(const bool dirty)
+        {
+                mDirty = dirty;
+        }
+
         //////////
         //-- mailing stuff
@@ -122 +127 @@
 
         void *mEvaluationHack;
+
 protected:
 

GTP/trunk/Lib/Vis/Preprocessing/src/TestPreprocessor.vcproj

@@ -206 +206 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="xerces-c_2.lib glew32.lib zdll.lib zziplib.lib devil.lib glut32.lib OpenGL32.Lib glu32.lib Preprocessor.lib RTScene.lib RTWorld.lib QtCore4.lib qtmain.lib QtOpenGL4.lib Qt3Support4.lib QtTest4.lib QtGui4.lib QtGlRenderer.lib"
-                                OutputFile="../bin/release/Preprocessor.exe"
+                                OutputFile="../bin/release/Preprocessor2.exe"
                                 LinkIncremental="1"
                                 AdditionalLibraryDirectories="..\src\GL;..\lib\release;..\..\Preprocessing\lib\release;..\..\..\..\..\..\NonGTP\Boost\lib;..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\..\..\..\NonGTP\Zlib\lib;..\..\..\..\..\..\NonGTP\Devil\lib;..\MultiLevelRayTracing\RTScene\Release;..\MultiLevelRayTracing\RTWorld\Release;"$(QTDIR)\lib";.\QtGlRenderer\Release"

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

@@ -2994 +2994 @@
         {
                 candidate->Mail();
+                candidate->SetDirty(true);
                 dirtyList.push_back(candidate);
         }