Changeset 1002

Timestamp:

06/07/06 10:59:55 (19 years ago)

Author:

mattausch

Message:

debug run: fixing memory holes

Location:

GTP/trunk/Lib/Vis

Files:

• OnlineCullingCHC/OGRE/include/OgrePlatformOcclusionQuery.h (modified) (1 diff)
• OnlineCullingCHC/OGRE/scripts/Plugin_VisibilitySceneManager.vcproj (modified) (3 diffs)
• OnlineCullingCHC/scripts/GtpVisibility.vcproj (modified) (1 diff)
• Preprocessing/bin/QtCored4.dll (added)
• Preprocessing/bin/QtGuid4.dll (added)
• Preprocessing/bin/QtOpenGLd4.dll (added)
• Preprocessing/scripts/Preprocessor.vcproj (modified) (4 diffs)
• Preprocessing/scripts/TestPreprocessor.vcproj (modified) (5 diffs)
• Preprocessing/src/Environment.cpp (modified) (2 diffs)
• Preprocessing/src/FromPointVisibilityTree.cpp (modified) (4 diffs)
• Preprocessing/src/FromPointVisibilityTree.h (modified) (3 diffs)
• Preprocessing/src/GlRenderer.cpp (modified) (4 diffs)
• Preprocessing/src/KdTree.cpp (modified) (2 diffs)
• Preprocessing/src/KdTree.h (modified) (4 diffs)
• Preprocessing/src/Mesh.cpp (modified) (4 diffs)
• Preprocessing/src/Mesh.h (modified) (1 diff)
• Preprocessing/src/Preprocessor.cpp (modified) (4 diffs)
• Preprocessing/src/RenderSampler.cpp (modified) (2 diffs)
• Preprocessing/src/ResourceManager.h (modified) (1 diff)
• Preprocessing/src/SceneGraph.cpp (modified) (1 diff)
• Preprocessing/src/SceneGraph.h (modified) (3 diffs)
• Preprocessing/src/UnigraphicsParser.cpp (modified) (1 diff)
• Preprocessing/src/ViewCell.cpp (modified) (6 diffs)
• Preprocessing/src/ViewCell.h (modified) (8 diffs)
• Preprocessing/src/ViewCellBsp.cpp (modified) (5 diffs)
• Preprocessing/src/ViewCellsManager.cpp (modified) (33 diffs)
• Preprocessing/src/ViewCellsManager.h (modified) (13 diffs)
• Preprocessing/src/VspBspTree.cpp (modified) (8 diffs)
• Preprocessing/src/VspOspTree.cpp (added)
• Preprocessing/src/VspOspTree.h (added)
• Preprocessing/src/VssPreprocessor.cpp (modified) (4 diffs)
• Preprocessing/src/X3dParser.cpp (modified) (1 diff)
• Preprocessing/src/main.cpp (modified) (4 diffs)

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include/OgrePlatformOcclusionQuery.h

@@ -20 +20 @@
         virtual ~PlatformOcclusionQuery();
 
-        virtual bool GetQueryResult(unsigned int &queryResult,
-        const bool waitForResult) const;
+        virtual bool GetQueryResult(unsigned int &queryResult, 
+                                                                const bool waitForResult) const;
         virtual void BeginQuery();
         virtual void EndQuery();

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/scripts/Plugin_VisibilitySceneManager.vcproj

@@ -20 +20 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\include";"$(OGRE_ADDONS_PATH)\dotsceneoctree\PlugIns\DotSceneManager\include";"$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\Dependencies\include\CEGUI";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include";"$(OGRE_PATH)\OgreMain\include";"$(OGRE_PATH)\Dependencies\include";..\include;..\..\GtpVisibility\include;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\OGRE\include;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\include"
+                                AdditionalIncludeDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\include";"$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\Dependencies\include\CEGUI";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include";"$(OGRE_PATH)\OgreMain\include";"$(OGRE_PATH)\Dependencies\include";..\include;..\..\..\OnlineCullingCHC\include;..\..\..\Preprocessing\src"
                                 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PLUGIN_OCCLUSIONCULLINGSCENEMANAGER_EXPORTS;GTP_VISIBILITY_MODIFIED_OGRE"
                                 MinimalRebuild="TRUE"
@@ -36 +36 @@
                                 Name="VCLinkerTool"
                                 IgnoreImportLibrary="TRUE"
-                                AdditionalDependencies="OgreMain_d.lib CEGUIBase_d.lib OgreGUIRenderer_d.lib Plugin_OctreeSceneManager.lib GtpVisibility.lib"
+                                AdditionalDependencies="OgreMain_d.lib CEGUIBase_d.lib OgreGUIRenderer_d.lib Plugin_OctreeSceneManager.lib GtpVisibility.lib zdll.lib zziplibd.lib Preprocessor.lib devil.lib glut32.lib xerces-c_2.lib OpenGL32.Lib glu32.lib cg.lib cgGL.lib glew32.lib qtmain.lib QtOpenGLd4.lib QtCored4.lib QtGuid4.lib Qt3Supportd4.lib QAxContainer.lib"
                                 OutputFile="$(OutDir)/Plugin_VisibilitySceneManager.dll"
                                 Version="0.99"
                                 LinkIncremental="1"
                                 SuppressStartupBanner="TRUE"
-                                AdditionalLibraryDirectories=""$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)";"$(OGRE_PATH)\Dependencies\lib\$(ConfigurationName)";"$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";"$(OGRE_ADDONS_PATH)\dotsceneoctree\PlugIns\DotSceneManager\bin\$(ConfigurationName)";"..\lib\$(ConfigurationName)";"..\..\lib\$(ConfigurationName)";"..\..\GtpVisibility\lib\$(ConfigurationName)""
+                                AdditionalLibraryDirectories=""$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)";"$(OGRE_PATH)\Dependencies\lib\$(ConfigurationName)";"$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";"..\lib\$(ConfigurationName)";"..\..\lib\$(ConfigurationName)";"..\..\..\Preprocessing\lib\$(ConfigurationName)";..\..\..\Preprocessing\src\GL;..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;"$(QTDIR)\lib";"$(CG_LIB_PATH)""
                                 ModuleDefinitionFile="..\misc\OgreVisibilitySceneManager.def"
                                 GenerateDebugInformation="TRUE"
@@ -104 +104 @@
                                 Name="VCLinkerTool"
                                 IgnoreImportLibrary="TRUE"
-                                AdditionalDependencies="OgreMain.lib CEGUIBase.lib OgreGUIRenderer.lib Plugin_OctreeSceneManager.lib GtpVisibility.lib zdll.lib zziplibd.lib Preprocessor.lib xerces-c_2.lib devil.lib qtmain.lib QtOpenGL4.lib QtCored4.lib QtGuid4.lib Qt3Support4.lib QAxContainer.lib glut32.lib OpenGL32.Lib glu32.lib cg.lib cgGL.lib glew32.lib glew32s.lib"
+                                AdditionalDependencies="OgreMain.lib CEGUIBase.lib OgreGUIRenderer.lib Plugin_OctreeSceneManager.lib GtpVisibility.lib zdll.lib zziplib.lib Preprocessor.lib xerces-c_2.lib devil.lib qtmain.lib QtOpenGL4.lib QtCore4.lib QtGui4.lib Qt3Support4.lib QAxContainer.lib glut32.lib OpenGL32.Lib glu32.lib cg.lib cgGL.lib glew32.lib glew32s.lib"
                                 OutputFile="$(OutDir)/Plugin_VisibilitySceneManager.dll"
                                 Version="0.99"

GTP/trunk/Lib/Vis/OnlineCullingCHC/scripts/GtpVisibility.vcproj

@@ -20 +20 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories=""$(OGRE_PATH)\OgreMain\include";..\include"
+                                AdditionalIncludeDirectories=""$(OGRE_PATH)\OgreMain\include";..\include;..\..\Preprocessing\src"
                                 PreprocessorDefinitions="WIN32;_DEBUG;_LIB;GTP_VISIBILITY_MODIFIED_OGRE"
                                 MinimalRebuild="TRUE"

GTP/trunk/Lib/Vis/Preprocessing/scripts/Preprocessor.vcproj

@@ -15 +15 @@
                         OutputDirectory="..\lib\$(ConfigurationName)"
                         IntermediateDirectory="..\obj\$(ConfigurationName)"
-                        ConfigurationType="1"
+                        ConfigurationType="4"
                         CharacterSet="2">
                         <Tool
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="..\support;..\support\devil\include;..\support\zlib\include;..\include..\support;&quot;..\include  ..\support&quot;;..\include;&quot;$(QTDIR)\include\QtCore&quot;;&quot;$(CG_INC_PATH)&quot;;&quot;$(QTDIR)\include&quot;;&quot;$(QTDIR)\include\QtOpenGl&quot;;&quot;$(QTDIR)\include\QtGui&quot;;&quot;$(GTPDIR)\NonGTP\Zlib\include&quot;;..\..\..\..\..\..\NonGTP\Xerces;..\..\..\..\..\..\NonGTP\Devil\include;..\src"
-                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+                                AdditionalIncludeDirectories="..\include;&quot;$(QTDIR)\include\QtCore&quot;;&quot;$(QTDIR)\include\QtGui&quot;;&quot;$(QTDIR)\include&quot;;&quot;$(QTDIR)\include\QtOpenGl&quot;;..\src;&quot;$(CG_INC_PATH)&quot;;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces"
+                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
                                 MinimalRebuild="TRUE"
                                 BasicRuntimeChecks="3"
@@ -33 +33 @@
                                 Name="VCCustomBuildTool"/>
                         <Tool
-                                Name="VCLinkerTool"
-                                AdditionalDependencies="xerces-c_2D.lib zdll.lib zziplibd.lib devil.lib qtmain.lib QtOpenGLd4.lib QtCored4.lib QtGuid4.lib Qt3Supportd4.lib QAxContainer.lib glut32.lib OpenGL32.Lib glu32.lib cg.lib cgGL.lib"
-                                AdditionalLibraryDirectories="..\support\xercesc\lib\;..\support\zlib\lib\;..\support\devil\lib;&quot;$(QTDIR)\lib&quot;;..\include;..\src\GL;&quot;$(CG_LIB_PATH)&quot;;&quot;$(GTPDIR)\NonGTP\Xerces&quot;;&quot;$(GTPDIR)\NonGTP\Xerces\xercesc\lib&quot;;&quot;$(GTPDIR)\NonGTP\zlib\lib&quot;;&quot;$(GTPDIR)\NonGTP\Devil\lib&quot;"/>
+                                Name="VCLibrarianTool"/>
                         <Tool
                                 Name="VCMIDLTool"/>
@@ -50 +48 @@
                         <Tool
                                 Name="VCXMLDataGeneratorTool"/>
-                        <Tool
-                                Name="VCWebDeploymentTool"/>
                         <Tool
                                 Name="VCManagedWrapperGeneratorTool"/>
@@ -68 +64 @@
                                 FavorSizeOrSpeed="0"
                                 OptimizeForWindowsApplication="TRUE"
-                                AdditionalIncludeDirectories="..\support;..\support\devil\include;..\support\zlib\include;..\include;&quot;$(QTDIR)\include\QtCore&quot;;&quot;$(QTDIR)\include\QtGui&quot;;&quot;$(QTDIR)\include&quot;;&quot;$(QTDIR)\include\QtOpenGl&quot;;..\src;&quot;$(CG_INC_PATH)&quot;;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces"
+                                AdditionalIncludeDirectories="..\include;&quot;$(QTDIR)\include\QtCore&quot;;&quot;$(QTDIR)\include\QtGui&quot;;&quot;$(QTDIR)\include&quot;;&quot;$(QTDIR)\include\QtOpenGl&quot;;..\src;&quot;$(CG_INC_PATH)&quot;;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
                                 ExceptionHandling="TRUE"

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

@@ -13 +13 @@
                 <Configuration
                         Name="Debug|Win32"
-                        OutputDirectory="Debug"
-                        IntermediateDirectory="Debug"
+                        OutputDirectory="..\bin\Debug"
+                        IntermediateDirectory="..\obj\Debug"
                         ConfigurationType="1"
                         CharacterSet="2">
@@ -20 +20 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
+                                AdditionalIncludeDirectories="..\include;&quot;$(QTDIR)\include\QtCore&quot;;&quot;$(QTDIR)\include\QtGui&quot;;&quot;$(QTDIR)\include&quot;;&quot;$(QTDIR)\include\QtOpenGl&quot;;..\src;&quot;$(CG_INC_PATH)&quot;;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces"
                                 PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
                                 MinimalRebuild="TRUE"
                                 BasicRuntimeChecks="3"
-                                RuntimeLibrary="5"
+                                RuntimeLibrary="3"
                                 UsePrecompiledHeader="0"
                                 WarningLevel="3"
@@ -32 +33 @@
                         <Tool
                                 Name="VCLinkerTool"
-                                AdditionalDependencies="xerces-c_2D.lib zdll.lib zziplibd.lib devil.lib qtmain.lib QtOpenGLd4.lib QtCored4.lib QtGuid4.lib Qt3Supportd4.lib QAxContainer.lib glut32.lib OpenGL32.Lib glu32.lib cg.lib cgGL.lib"
-                                OutputFile="$(OutDir)/TestPreprocessor.exe"
+                                AdditionalDependencies="xerces-c_2D.lib zdll.lib zziplibd.lib devil.lib qtmain.lib QtOpenGLd4.lib QtCored4.lib QtGuid4.lib Qt3Supportd4.lib QAxContainer.lib glut32.lib OpenGL32.Lib glu32.lib cg.lib cgGL.lib Preprocessor.lib glew32.lib"
+                                OutputFile="$(OutDir)/Preprocessor.exe"
                                 LinkIncremental="2"
-                                AdditionalLibraryDirectories="..\support\xercesc\lib\;..\support\zlib\lib\;..\support\devil\lib;&quot;$(QTDIR)\lib&quot;;..\include;..\src\GL;&quot;$(CG_LIB_PATH)&quot;;&quot;$(GTPDIR)\NonGTP\Xerces&quot;;&quot;$(GTPDIR)\NonGTP\Xerces\xercesc\lib&quot;;&quot;$(GTPDIR)\NonGTP\zlib\lib&quot;;&quot;$(GTPDIR)\NonGTP\Devil\lib&quot;"
+                                AdditionalLibraryDirectories="&quot;$(QTDIR)\lib&quot;;..\include;..\src\GL;&quot;$(CG_LIB_PATH)&quot;;&quot;$(GTPDIR)\NonGTP\Xerces&quot;;&quot;$(GTPDIR)\NonGTP\Xerces\xercesc\lib&quot;;&quot;$(GTPDIR)\NonGTP\zlib\lib&quot;;&quot;$(GTPDIR)\NonGTP\Devil\lib&quot;;..\lib\debug"
                                 GenerateDebugInformation="TRUE"
                                 ProgramDatabaseFile="$(OutDir)/TestPreprocessor.pdb"
@@ -69 +70 @@
                         <Tool
                                 Name="VCCLCompilerTool"
-                                AdditionalIncludeDirectories="..\support;..\support\devil\include;..\support\zlib\include;..\include;&quot;$(QTDIR)\include\QtCore&quot;;&quot;$(QTDIR)\include\QtGui&quot;;&quot;$(QTDIR)\include&quot;;&quot;$(QTDIR)\include\QtOpenGl&quot;;..\src;&quot;$(CG_INC_PATH)&quot;;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces"
+                                AdditionalIncludeDirectories="..\include;&quot;$(QTDIR)\include\QtCore&quot;;&quot;$(QTDIR)\include\QtGui&quot;;&quot;$(QTDIR)\include&quot;;&quot;$(QTDIR)\include\QtOpenGl&quot;;..\src;&quot;$(CG_INC_PATH)&quot;;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
                                 RuntimeLibrary="2"
@@ -83 +84 @@
                                 OutputFile="$(OutDir)/Preprocessor.exe"
                                 LinkIncremental="1"
-                                AdditionalLibraryDirectories="..\support\xercesc\lib\;..\support\zlib\lib\;..\support\devil\lib;&quot;$(QTDIR)\lib&quot;;..\include;..\src\GL;&quot;$(CG_LIB_PATH)&quot;;..\..\..\..\..\..\NonGTP\Xerces;..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\..\..\..\NonGTP\zlib\lib;..\..\..\..\..\..\NonGTP\Devil\lib;&quot;..\..\Preprocessing\lib\$(ConfigurationName)&quot;"
+                                AdditionalLibraryDirectories="..\support\xercesc\lib\;..\support\zlib\lib\;..\support\devil\lib;&quot;$(QTDIR)\lib&quot;;..\include;..\src\GL;&quot;$(CG_LIB_PATH)&quot;;&quot;$(GTPDIR)\NonGTP\Xerces&quot;;&quot;$(GTPDIR)\NonGTP\Xerces\xercesc\lib&quot;;&quot;$(GTPDIR)\NonGTP\zlib\lib&quot;;&quot;$(GTPDIR)\NonGTP\Devil\lib&quot;;..\lib\release"
                                 GenerateDebugInformation="FALSE"
                                 SubSystem="1"

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

@@ -245 +245 @@
 void
 Environment::RegisterOption(const char *name,
-                             const EOptType type,
-                             const char *abbrev,
-                             const char *defValue)
+                                                        const EOptType type,
+                                                        const char *abbrev,
+                                                        const char *defValue)
 {
   int i;
@@ -2154 +2154 @@
         RegisterOption("VspBspTree.Construction.renderCostWeight",
                         optFloat,
-                        "-vsp_bsp_post_process_render_cost_weight",
+                        "vsp_bsp_post_process_render_cost_weight=",
                         "0.5");
 

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

@@ -304 +304 @@
                                         dynamic_cast<TransformedMeshInstance *>(object);
 
-                                if (!mi->GetMesh())
+                                if (!mi->GetMesh())     
                                         break;
-
-                                mesh = new Mesh(*mi->GetMesh());
-
-                                Matrix4x4 m;
-                                mi->GetWorldTransform(m);
-                                mesh->ApplyTransformation(m);
+                                mesh = new Mesh();
+                                mi->GetTransformedMesh(*mesh);
 
                                 break;
@@ -361 +357 @@
         {
                 VssRay *ray = *rit;
+                Intersectable *obj = ray->mTerminationObject;
 
                 if ((mBox.IsInside(ray->mTermination) || !forcedBoundingBox) &&
-                        ray->mTerminationObject && 
-                        !ray->mTerminationObject->Mailed())
-                {
-                        ray->mTerminationObject->Mail();
-                        MeshInstance *obj = dynamic_cast<MeshInstance *>(ray->mTerminationObject);
-                        AddMeshToPolygons(obj->GetMesh(), polys, obj);
-                        ++ numObj;
+                        obj && !obj->Mailed())
+                {
+                        obj->Mail();
+
+                        // transformed mesh instance and mesh instance handle mesh differently
+                        if (obj->Type() == Intersectable::TRANSFORMED_MESH_INSTANCE)
+                        {
+                                Mesh mesh;
+                                
+                                TransformedMeshInstance *tmobj = 
+                                        dynamic_cast<TransformedMeshInstance *>(obj);
+                                
+                                tmobj->GetTransformedMesh(mesh);
+                                AddMeshToPolygons(&mesh, polys, tmobj);
+                        }
+                        else // MeshInstance
+                        {
+                                MeshInstance *mobj = dynamic_cast<MeshInstance *>(obj);
+                                AddMeshToPolygons(mobj->GetMesh(), polys, mobj);
+                        }
 
                         //-- compute bounding box
@@ -802 +812 @@
 
                 // update single pvs parameter
-                viewCell->mPvsSize = viewCell->GetPvs().GetSize(); 
-                viewCell->mPvsSizeValid = true;
-
+                mViewCellsManager->SetScalarPvsSize(viewCell, viewCell->GetPvs().GetSize()); 
+        
 
                 mBspStats.contributingSamples += conSamp;
@@ -936 +945 @@
                 AddToPvs(leaf, *tData.mRays, sampCon, conSamp);
 
-                viewCell->mPvsSize = viewCell->GetPvs().GetSize();
-                viewCell->mPvsSizeValid = true;
-
+                mViewCellsManager->SetScalarPvsSize(viewCell, viewCell->GetPvs().GetSize());
+                
                 mBspStats.contributingSamples += conSamp;
                 mBspStats.sampleContributions +=(int) sampCon;

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

@@ -33 +33 @@
 {
         Vector3 mPosition;
+
         /// from point visibility => visible objects, not potentially
         ObjectPvs mVisibleObjects;
@@ -39 +40 @@
 
 /**
-        This is a view space partitioning specialised BSPtree.  
-        There are no polygon splits, but we split the sample rays. 
-        The candidates for the next split plane are evaluated only 
-        by checking the sampled visibility information. 
-        The polygons are employed merely as candidates for the next split planes.
+        This is a tree which partitions from point queries in a greedy optimal fashion.
 */
 class FromPointVisibilityTree 
@@ -49 +46 @@
         friend class ViewCellsParseHandlers;
         friend class VspBspViewCellsManager;
+
 public:
         

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

@@ -187 +187 @@
 
         glPushMatrix();
-/*
-        cout << "\n*******" << endl;
-        for (int i = 0; i < 16; ++ i)
-                cout << (float *)(m.x)[i] << " ";
-        
-        cout << "\n*******" << endl;
+/* cout << "\n";
         for (int i = 0; i < 4; ++ i)
                 for (int j = 0; j < 4; ++ j)
-                        cout << m.x[i][j] << " ";
-
-cout << "\n==" << endl;*/
+                        cout << m.x[i][j] << " "; cout << "\n"*/
 
         glMultMatrixf((float *)m.x);
-        GLfloat dummy[16];
-
-        /*glGetFloatv(GL_MODELVIEW_MATRIX, dummy);
-
+
+        /*GLfloat dummy[16];
+        glGetFloatv(GL_MODELVIEW_MATRIX, dummy);
         for (int i = 0; i < 16; ++ i)
                 cout << dummy[i] << " ";
@@ -631 +623 @@
         sample.mVisibleObjects = 0;
 
-        int i, j;
-
         // reset object counters
         ObjectContainer::const_iterator it, it_end = mObjects.end();
@@ -649 +639 @@
 
         // query all 6 directions for a full point sample
-        for (i = 0; i < 6; ++ i) 
+        for (int i = 0; i < 6; ++ i) 
         {
                 mViewDirection = directions[i];
@@ -718 +708 @@
   SetupProjection(GetHeight(), GetHeight(), 90.0f);
 
-  samples.resize(numSamples);
+  //samples.resize(numSamples);
   halton.Reset();
   
   // the number of queries queried in batch mode
   const int numQ = 500;
+
   //const int numQ = (int)mObjects.size();
   if (useOcclusionQueries)

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

@@ -21 +21 @@
     mDepth = 0;
 }
+
+
+KdInterior::~KdInterior()
+{
+        // recursivly destroy children
+        DEL_PTR(mFront);
+        DEL_PTR(mBack);
+}
+
 
 KdTree::KdTree()
@@ -54 +63 @@
   splitCandidates = NULL;
 }
+
+
+KdTree::~KdTree()
+{
+        DEL_PTR(mRoot);
+}
+
 
 bool

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

@@ -97 +97 @@
   bool Mailed() const { return mailbox == mailID; }
 
-
+  virtual ~KdNode(){};
   KdNode(KdInterior *parent);
 
@@ -124 +124 @@
     
   KdInterior(KdInterior *parent):KdNode(parent), mBack(NULL), mFront(NULL) {}
+
+  ~KdInterior();
 
   /** \sa KdNode::IsLeaf() */
@@ -170 +172 @@
   }
 
+  ~KdLeaf() { DEL_PTR(mViewCell);  }
         
         void AddPassingRay2(const Ray &ray,
@@ -254 +257 @@
   
   KdTree();
-  
+
+  ~KdTree();
     
   /** Insert view cell into the tree */

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

@@ -608 +608 @@
         mFaces.reserve(rhs.mFaces.size());
         mId = rhs.mId;
+        mMaterial = rhs.mMaterial;
 
         FaceContainer::const_iterator it, it_end = rhs.mFaces.end();
@@ -628 +629 @@
         mVertices = m.mVertices;
         mFaces.reserve(m.mFaces.size());
+        mMaterial = m.mMaterial;
+        // note: we don't copy id on purpose
         //mId = m.mId;
-
+        
         FaceContainer::const_iterator it, it_end = m.mFaces.end();
 
@@ -695 +698 @@
 
 /*************************************************************/
-/*                      TransformedMeshInstance implementation               */
+/*           TransformedMeshInstance implementation          */
 /*************************************************************/
 
@@ -747 +750 @@
 }
 
-
-}
+ void TransformedMeshInstance::GetTransformedMesh(Mesh &transformedMesh)
+ {
+         // copy mesh
+        transformedMesh = *mMesh;
+        transformedMesh.ApplyTransformation(mWorldTransform);
+ }
+
+}

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

@@ -329 +329 @@
   void GetWorldTransform(Matrix4x4 &m);
 
+  /** Transforms mesh-
+        @param transformedMesh returns the tranformed mesh.
+  */
+  void GetTransformedMesh(Mesh &transformedMesh);
+
 protected:
 

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

@@ -115 +115 @@
 mVspKdTree(NULL),
 mVspBspTree(NULL),
-mViewCellsManager(NULL)
+mViewCellsManager(NULL),
+mRenderSimulator(NULL)
 {
         environment->GetBoolValue("Preprocessor.useGlRenderer", mUseGlRenderer);
@@ -165 +166 @@
   DEL_PTR(mVspBspTree);
   cout << "done.\n";
+
+   cout << "Deleting scene graph...\n";
+  DEL_PTR(mSceneGraph);
+  cout << "done.\n";
+
+  DEL_PTR(mRenderSimulator);
+  DEL_PTR(renderer);
 }
 
@@ -276 +284 @@
   if (mApplyVisibilityFilter || mApplyVisibilitySpatialFilter) {
         cout<<"Applying visibility filter ...";
-        cout<<"filyter width = " << mVisibilityFilterWidth << endl;
-        
+        cout<<"filter width = " << mVisibilityFilterWidth << endl;
+        
+        if (!mViewCellsManager)
+                return false;
+
         mViewCellsManager->ApplyFilter(mKdTree,
                                                                    mApplyVisibilityFilter ? mVisibilityFilterWidth : -1.0f,
@@ -361 +372 @@
         {
                 //-- parse type of view cell container
-                char viewCellsStr[64];
-                environment->GetStringValue("ViewCells.type", viewCellsStr);
-                
-            mViewCellsManager = CreateViewCellsManager(viewCellsStr);
+                environment->GetStringValue("ViewCells.type", buf);             
+            mViewCellsManager = CreateViewCellsManager(buf);
         }
 

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

@@ -33 +33 @@
         cout << "starting sampling of render cost ... ";
 
-        vector<RenderCostSample> samples;
-        while (1){cout <<"q";}
+        vector<RenderCostSample> samples(mSamples);
+  
         if (renderer)
         {
@@ -57 +57 @@
                 histogram[i] = 0;
         }
-
+cout << "here3 "<< mSamples << endl;
+        cout << "here2 " << samples.size() << endl;
         // store maximal pvs
         for (int i = 0; i < mSamples; ++ i) 

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

@@ -114 +114 @@
                 for (mit = mEntries.begin(); mit != mEntries.end(); ++ mit)
                 {
-                        cout << "mesh: " << (*mit).first << " " << (*mit).second << endl;
+                        //cout << "mesh: " << (*mit).first << " " << (*mit).second << endl;
                         DEL_PTR((*mit).second);
                 }

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

@@ -25 +25 @@
     return false;
   
+}
+
+
+SceneGraph::~SceneGraph()
+{
+        DEL_PTR(mRoot);
+}
+
+
+SceneGraphNode::~SceneGraphNode()
+{
+        CLEAR_CONTAINER(mGeometry);
+        SceneGraphNodeContainer::iterator it, it_end = mChildren.end();
+
+        // recursivly delete all children
+        CLEAR_CONTAINER(mChildren);
 }
 

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

@@ -11 +11 @@
   
 /** Basic scene graph node, we are interested only in bounding boxes and topology
-    of the scene graph */
+    of the scene graph 
+        */
 class SceneGraphNode {
 public:
@@ -17 +18 @@
   SceneGraphNodeContainer mChildren;
   AxisAlignedBox3 mBox;
+  ~SceneGraphNode();
   void UpdateBox();
 };
@@ -25 +27 @@
 
 public:
+
+        ~SceneGraph();
+
   SceneGraphNode *mRoot;
   bool Export(const string filename);

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

@@ -161 +161 @@
                 if (ROTATE_SCENE)
                         RotateMesh(currentMesh);
-                                currentMesh->Preprocess();
-                                // make an instance of this mesh
-                                MeshInstance *mi = new MeshInstance(currentMesh);
-                                root->mGeometry.push_back(mi);  
-                                currentMesh = new Mesh;
+
+                currentMesh->Preprocess();
+                // make an instance of this mesh
+                MeshInstance *mi = new MeshInstance(currentMesh);
+                root->mGeometry.push_back(mi);  
+                currentMesh = MeshManager::GetSingleton()->CreateResource();
       }
     }

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

@@ -55 +55 @@
 }
 
-
+/// Counts differences between pvss.
 inline int CountDiffPvs(ViewCell *vc)
 {
@@ -100 +100 @@
 
         return pvs;
-}
-
-// computet render cost of merge
-float ViewCellsTree::ComputeMergedPvsCost(const ObjectPvs &pvs1, 
-                                                                                  const ObjectPvs &pvs2) const
-{
-        float renderCost = 0;
-
-        // compute new pvs size
-        ObjectPvsMap::const_iterator it, it_end =  pvs1.mEntries.end();
-
-        Intersectable::NewMail();
-
-        // first mail all objects in first pvs
-        for (it = pvs1.mEntries.begin(); it != it_end; ++ it)
-        {
-                Intersectable *obj = (*it).first;
-
-                obj->Mail();
-                renderCost += mViewCellsManager->EvalRenderCost(obj);
-        }
-
-        it_end = pvs2.mEntries.end();
-
-        
-        for (it = pvs2.mEntries.begin(); it != it_end; ++ it)
-        {
-                Intersectable *obj = (*it).first;
-
-                // test if object already considered    
-                if (!obj->Mailed())
-                {
-                        renderCost += mViewCellsManager->EvalRenderCost(obj);
-                }
-        }
-
-        return renderCost;
 }
 
@@ -281 +244 @@
 }
 
+
+bool ViewCell::AddPvsSample(Intersectable *sample,
+                                                        const float pdf, 
+                                                        float &contribution)
+{
+        const bool result = mPvs.AddSample(sample, pdf, contribution);
+
+        // update pvs size
+        mPvsSize = mPvs.GetSize();
+        mPvsSizeValid = true;
+
+        return result;
+}
+
+
+
+
 /************************************************************************/
 /*                class ViewCellInterior implementation                 */
@@ -315 +295 @@
 {
     mChildren.push_back(vc);
-    vc->mParent = this;
+    vc->SetParent(this);
 }
 
@@ -797 +777 @@
 
         cout << "finished" << endl;
+}
+
+
+float ViewCellsTree::ComputeMergedPvsCost(const ObjectPvs &pvs1, 
+                                                                                  const ObjectPvs &pvs2) const
+{
+        // computes render cost of merge
+        float renderCost = 0;
+
+        // compute new pvs size
+        ObjectPvsMap::const_iterator it, it_end =  pvs1.mEntries.end();
+
+        Intersectable::NewMail();
+
+        // first mail all objects in first pvs
+        for (it = pvs1.mEntries.begin(); it != it_end; ++ it)
+        {
+                Intersectable *obj = (*it).first;
+
+                obj->Mail();
+                renderCost += mViewCellsManager->EvalRenderCost(obj);
+        }
+
+        it_end = pvs2.mEntries.end();
+
+        
+        for (it = pvs2.mEntries.begin(); it != it_end; ++ it)
+        {
+                Intersectable *obj = (*it).first;
+
+                // test if object already considered    
+                if (!obj->Mailed())
+                {
+                        renderCost += mViewCellsManager->EvalRenderCost(obj);
+                }
+        }
+
+        return renderCost;
 }
 
@@ -2146 +2164 @@
 {
         // if one has a parent, it was already merged
-        return !(mLeftViewCell->mParent || mRightViewCell->mParent);
+        return !(mLeftViewCell->GetParent() || mRightViewCell->GetParent());
 }
 

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

@@ -98 +98 @@
         friend class ViewCellsTree;
         friend class ViewCellsManager;
-        friend class VspBspViewCellsManager;
-        friend class BspViewCellsManager;
-        friend class VspBspTree;
-        friend class FromPointVisibilityTree;
-        friend class BspTree;
+        //friend class VspBspViewCellsManager;
+        //friend class BspViewCellsManager;
+        //friend class VspBspTree;
+        //friend class FromPointVisibilityTree;
+        //friend class BspTree;
 
 
@@ -120 +120 @@
         const ObjectPvs &GetPvs() const;
 
+        /** Returns pvs.
+        */
         ObjectPvs &GetPvs();
 
+        /** Completely substitutes the pvs.
+        */
         void SetPvs(const ObjectPvs &pvs);
 
@@ -128 +132 @@
         int Type() const;
 
+        
+        /** Adds a passing ray to the passing ray container.
+        */
+        void AddPassingRay(const Ray &ray, const int contributions);
+
+        /** Returns volume of the view cell.
+        */
+        float GetVolume() const;
+
+        /** Returns area of the view cell.
+        */
+        float GetArea() const;
+
+        /** Sets the volume of the view cell.
+        */
+        void SetVolume(float volume);
+        
+        /** Sets the area of the view cell.
+        */
+        void SetArea(float area);
+
+
+        /** if this view cell is the root of a view cell hierarchy
+        */
+        bool IsRoot() const;
+
+        /** Returns parent view cell.
+        */
+        ViewCellInterior *GetParent() const;
+
+        /** Sets parent of this view cell.
+        */
         void SetParent(ViewCellInterior *parent);
 
-        /** Adds a passing ray to the passing ray container.
-        */
-        void AddPassingRay(const Ray &ray, const int contributions);
-
-        /** Returns volume of the view cell.
-        */
-        float GetVolume() const;
-
-        /** Returns area of the view cell.
-        */
-        float GetArea() const;
-
-        /** Sets the volume of the view cell.
-        */
-        void SetVolume(float volume);
-        
-        /** Sets the area of the view cell.
-        */
-        void SetArea(float area);
-
-
-        /** if this view cell is the root of a view cell hierarchy
-        */
-        bool IsRoot() const;
-
-        /** Returns parent view cell.
-        */
-        ViewCellInterior *GetParent() const;
-
-        
+
         /** Sets the mesh for this view cell.
         */
         void SetMesh(Mesh *mesh);
 
+        /** Sets this view cell to be a valid view cell according to some criteria.
+        */
         void SetValid(const bool valid);
+        /** Returns true if this view cell is considered to be valid according to
+                some criteria.
+        */
         bool GetValid() const;
 
@@ -179 +191 @@
     RgbColor GetColor() const;
 
+        /** Adds a sample to the pvs.
+                @param sample the sample to be added
+                @param pdf a continuos measure of visibility
+                @param contribution returns the contribution of this sample to the pvs
+        */
+        bool AddPvsSample(Intersectable *sample, const float pdf, float &contribution);
   
-        /// parent view cell in the view cell hierarchy
-        ViewCellInterior *mParent;
+
 
         /// Rays piercing this view cell.
@@ -211 +228 @@
         }
 
+        /** Sets merge cost used for merging this view cell from other cells. 
+                @hack The function is available for leaves also to have a common interface,
+                but it should be less than zero for leaves.
+                */
         void SetMergeCost(const float mergeCost);
 
+        /** Returns merge cost needed to merge this leaf from other cells.
+                @hack The function is available for leaves also to have a common interface,
+                but it should be less than zero for leaves.
+        */
         float GetMergeCost() const;
+
+
+
+        ////////////////////////////////////////////
+        //       mailing stuff
+
 
         static void NewMail(const int reserve = 1) 
@@ -228 +259 @@
 
         int IncMail() { return ++mMailbox - sMailId; }
-
 
 
@@ -239 +269 @@
 protected:
 
+        /// parent view cell in the view cell hierarchy
+        ViewCellInterior *mParent;
+
         /// the potentially visible objects
         ObjectPvs mPvs;
@@ -253 +286 @@
 
         
-        /// pvs size, used for lazy pvs computation
+        /// store pvs size, used for evaluation purpose when pvss are stored only in the leaves
         int mPvsSize;
-        /// if the given pvs size is the real pvs size
+        /// if the pvs size scalar is up to date and corresponding to the real pvs size
         bool mPvsSizeValid;
 

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

@@ -661 +661 @@
                 case Intersectable::TRANSFORMED_MESH_INSTANCE:
                         {
-                                TransformedMeshInstance *mi = 
-                                        dynamic_cast<TransformedMeshInstance *>(object);
-
-                                if (!mi->GetMesh())
+                                TransformedMeshInstance *mi = dynamic_cast<TransformedMeshInstance *>(object);
+
+                                if (!mi->GetMesh())     
                                         break;
-
-                                mesh = new Mesh(*mi->GetMesh());
-
-                                Matrix4x4 m;
-                                mi->GetWorldTransform(m);
-                                mesh->ApplyTransformation(m);
+                                mesh = new Mesh();
+                                mi->GetTransformedMesh(*mesh);
                                 
                                 break;
@@ -773 +768 @@
                 }
         }
+
+        CLEAR_CONTAINER(boxPolys);
 }
 
@@ -810 +807 @@
                 {
                         MeshInstance *obj = dynamic_cast<MeshInstance *>(ray->intersections[0].mObject);
-                        Face *face = obj->GetMesh()->mFaces[ray->intersections[0].mFace];
-
+
+                        Mesh *mesh;
+                        if (obj->Type() == Intersectable::TRANSFORMED_MESH_INSTANCE)
+                        {
+                                TransformedMeshInstance *tmobj = 
+                                        dynamic_cast<TransformedMeshInstance *>(obj);
+                        
+                                mesh = new Mesh();
+                                tmobj->GetTransformedMesh(*mesh);
+                        }
+                        else // MeshInstance
+                        {
+                                mesh = obj->GetMesh();
+                        }
+
+                        Face *face = mesh->mFaces[ray->intersections[0].mFace];
                         std::map<Face *, Polygon3 *>::iterator it = facePolyMap.find(face);
 
@@ -821 +832 @@
                         } 
                         else
-                        {       //store rays if needed for heuristics
-                                Polygon3 *poly = new Polygon3(face, obj->GetMesh());
+                        {       
+                                //store rays if needed for heuristics
+                                Polygon3 *poly = new Polygon3(face, mesh);
                                 poly->mParent = obj;
                                 polys->push_back(poly);
@@ -831 +843 @@
                                 facePolyMap[face] = poly;
                         }
+
+                        // cleanup
+                        if (obj->Type() == Intersectable::TRANSFORMED_MESH_INSTANCE)
+                                DEL_PTR(mesh);
                 }
         }

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

@@ -39 +39 @@
 };
 
-//typedef priority_queue<ViewCell *, vector<ViewCell *>, myless<vector<ViewCell *>::value_type> > FilterQueue;
-
-
 
 ViewCellsManager::ViewCellsManager(Environment *env):
@@ -205 +202 @@
 ViewCellsManager::~ViewCellsManager()
 {
-        DEL_PTR(mRenderer);
+        //DEL_PTR(mRenderer);
 
         if (!ViewCellsTreeConstructed())
                 CLEAR_CONTAINER(mViewCells);
-        else
-                DEL_PTR(mViewCellsTree);
+        //else
+        DEL_PTR(mViewCellsTree);
 }
 
@@ -306 +303 @@
                 }
         }
-        Debug << "\nSampled " << i << " new view cells (" << " of " << (int)mEmptyViewCells.size() << ")" << endl << endl;
+        Debug << "\nSampled " << i << " new view cells (" 
+                  << " of " << (int)mEmptyViewCells.size() << ")" << endl << endl;
 }
 
@@ -395 +393 @@
                   << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
 
-
+return 0;
         // take post processing time
         startTime = GetTime();
 
-
-        // testing the view cell filter functionality   
-        if (0) TestFilter(preprocessor->mObjects);
-
         // -- stats after contruction
         ResetViewCells();
-
         Debug << "\nView cells after initial sampling:\n" << mCurrentViewCellsStats << endl;
+
 
         if (1) // export initial view cells
@@ -473 +467 @@
 
         
-
         //-- post processing
         VssRayContainer postProcessSamples;
@@ -494 +487 @@
 
 
-
         cout << "starting post processing and visualization" << endl;
 
@@ -514 +506 @@
                  << TimeDiff(startTime, GetTime()) *1e-3 << " secs" << endl;
 
-        // only for debugging purpose
-        if (TEST_EMPTY_VIEW_CELLS)
-                CollectEmptyViewCells();
-        
+        disposeRays(postProcessSamples, outRays);
+
+        
+        //return 1;
         // evaluation of the paritition, i.e., a number of new samples are cast
         if (mEvaluateViewCells)
@@ -523 +515 @@
                 EvalViewCellPartition(preprocessor);
         }
-        
+
+
         //-- visualization
         if (mShowVisualization)
@@ -679 +672 @@
                                                                                          const ObjectContainer &objects)
 {
-        if (!ViewCellsConstructed())
+        if (!ViewCellsConstructed() || !ViewCellsTreeConstructed())
                 return false;
 
@@ -764 +757 @@
         sort(viewCells.begin(), viewCells.end(), ViewCell::SmallerPvs);
 
-        //Debug << "********************" << endl;
-        //for (int i = 0; i < viewCells.size(); ++ i)
-        //      Debug << "pvs: " << mViewCellsTree->GetPvsSize(viewCells[i]) << " ";
-        //Debug << "\n";
         maxPvs = mViewCellsTree->GetPvsSize(viewCells.back());
         minVal = 0;
@@ -844 +833 @@
 
 
+bool ViewCellsManager::GetExportPvs() const 
+{
+        return mExportPvs;
+}
+
+
 void ViewCellsManager::EvalViewCellPartition(Preprocessor *preprocessor)
 {
@@ -862 +857 @@
         Debug << "view cell stats prefix: " << statsPrefix << endl;
 
-        //VssRayContainer outRays;
+        
         // should directional sampling be used?
         bool dirSamples = (mEvaluationSamplingType == Preprocessor::DIRECTION_BASED_DISTRIBUTION);
@@ -932 +927 @@
 
         //-- histogram
-
 
         bool useHisto;
@@ -1207 +1201 @@
 bool ViewCellsManager::ViewCellsTreeConstructed() const
 {
-        return mViewCellsTree->GetRoot();
+    return (mViewCellsTree && mViewCellsTree->GetRoot());
 }
 
@@ -1419 +1413 @@
 
 
-void ViewCellsManager::DeriveViewCells(const ObjectContainer &objects,
-                                                                           ViewCellContainer &viewCells,
-                                                                           const int maxViewCells) const
+void ViewCellsManager::DeriveViewCellsFromObjects(const ObjectContainer &objects,
+                                                                                                  ViewCellContainer &viewCells,
+                                                                                                  const int maxViewCells) const
 {
         // maximal max viewcells
@@ -1444 +1438 @@
 
                         Mesh *mesh = MeshManager::GetSingleton()->CreateResource();
-
-                        // copy mesh
-                        *mesh = *mi->GetMesh();
-
+                        
                         // transform mesh
-                        Matrix4x4 m;
-                        mi->GetWorldTransform(m);
-                        mesh->ApplyTransformation(m);
+                        mi->GetTransformedMesh(*mesh);
                         
                         // create bb + kd tree
@@ -2168 +2157 @@
 
 
+void ViewCellsManager::SetScalarPvsSize(ViewCell *vc, const int pvsSize) const
+{
+        vc->mPvsSize = pvsSize;
+        vc->mPvsSizeValid = true;
+}
+
+
 /**********************************************************************/
 /*                 BspViewCellsManager implementation                 */
@@ -2964 +2960 @@
         {
                 pvs = root->GetPvs();
-
-                root->mPvsSize = pvs.GetSize();
-                root->mPvsSizeValid = true;
-
+                SetScalarPvsSize(root, pvs.GetSize());
+                
                 return;
         }
@@ -3018 +3012 @@
         if (mViewCellsTree->ViewCellsStorage() == ViewCellsTree::PVS_IN_INTERIORS)
         {
-                interior->mPvs = pvs;
+                interior->SetPvs(pvs);
         }
         
         // set new pvs size
-        interior->mPvsSize = pvs.GetSize();
-        interior->mPvsSizeValid = true;
+    SetScalarPvsSize(interior, pvs.GetSize());
 
 #else
@@ -3781 +3774 @@
         Debug << "saved rays: " << (int)savedRays.size() << endl;
 
-
-        //TODO: remove
+        long startTime;
+
         if (1)
                 mVspBspTree->Construct(constructionRays, &mViewSpaceBox);
@@ -3790 +3783 @@
         // collapse invalid regions
         cout << "collapsing invalid tree regions ... ";
-        long startTime = GetTime();
-        int collapsedLeaves = mVspBspTree->CollapseTree();
+        startTime = GetTime();
+        const int collapsedLeaves = mVspBspTree->CollapseTree();
         Debug << "collapsed in " << TimeDiff(startTime, GetTime()) * 1e-3 
                   << " seconds" << endl;
@@ -3797 +3790 @@
     cout << "finished" << endl;
 
-        // -- stats
+        //-- stats
         Debug << mVspBspTree->GetStatistics() << endl;
 
@@ -4211 +4204 @@
         {
                 pvs = root->GetPvs();
-
-                root->mPvsSize = root->GetPvs().GetSize();
-                root->mPvsSizeValid = true;
-
+                SetScalarPvsSize(root, root->GetPvs().GetSize());
+                
                 return;
         }
@@ -4266 +4257 @@
         if (mViewCellsTree->ViewCellsStorage() == ViewCellsTree::PVS_IN_INTERIORS)
         {
-                interior->mPvs = pvs;
+                interior->SetPvs(pvs);
         }
         
         // set new pvs size
-        interior->mPvsSize = pvs.GetSize();
-        interior->mPvsSizeValid = true;
+        SetScalarPvsSize(interior, pvs.GetSize());
+        
 
 #else
@@ -4325 +4316 @@
         GetRaySets(sampleRays, mVisualizationSamples, visRays);
 
-        
-        if (1) // export view cells
+        //-- export view cells
+        if (1) 
         {       // hack pvs
-                int savedColorCode = mColorCode;
+                const int savedColorCode = mColorCode;
                 mColorCode = 1;
         
@@ -4367 +4358 @@
                 mColorCode = savedColorCode;
         }
+
 
         if (0)
@@ -5035 +5027 @@
   //  AxisAlignedBox3 box(center - Vector3(viewSpaceFilterSize/2),
   //                                      center + Vector3(viewSpaceFilterSize/2));
-
         if (!ViewCellsConstructed())
                 return;
 
-  if (viewSpaceFilterSize >=0.0f) {
+        if (viewSpaceFilterSize >= 0.0f) {
 
   bool usePrVS = false;
 
-  
   if (!usePrVS) {
         AxisAlignedBox3 box = GetViewCellBox(viewCell);
@@ -5052 +5042 @@
         
   //  cout<<"box="<<box<<endl;
-        ViewCellContainer::const_iterator it=viewCells.begin(), it_end = viewCells.end();
+        ViewCellContainer::const_iterator it = viewCells.begin(), it_end = viewCells.end();
         
         int i;
-        for (i=0; it != it_end; ++it, i++) {
-          //    cout<<"v"<<i<<" pvs="<<(*it)->GetPvs().mEntries.size()<<endl;
+        for (i=0; it != it_end; ++ it, ++ i) {
+                cout<<"v"<<i<<" pvs="<<(*it)->GetPvs().mEntries.size()<<endl;
           pvs.Merge((*it)->GetPvs());
         }
@@ -5070 +5060 @@
   } else
         pvs = viewCell->GetPvs();
-  
+   
   if (spatialFilterSize >=0.0f)
         ApplySpatialFilter(kdTree, spatialFilterSize, pvs);
-
+  
 }
 
@@ -5097 +5087 @@
   
   int i;
-  for (i=0, it = mViewCells.begin(); it != it_end; ++ it, i++) {
+  for (i=0, it = mViewCells.begin(); it != it_end; ++ it, ++ i) {
         ApplyFilter(*it,
                                 kdTree,
@@ -5107 +5097 @@
 
   // now replace all pvss
-  for (i= 0, it = mViewCells.begin(); it != it_end; ++ it, i++) {
+  for (i = 0, it = mViewCells.begin(); it != it_end; ++ it, ++ i) {
+            
         ObjectPvs &pvs = (*it)->GetPvs();
         pvs.Clear();
@@ -5114 +5105 @@
   }
   
-  delete newPvs;
+  delete [] newPvs;
 }
 
@@ -5180 +5171 @@
 
 //////////////////////////////////
-ViewCellsManager *ViewCellsManagerFactory::Create(const string mName)
+/*ViewCellsManager *ViewCellsManagerFactory::Create(const string mName)
 {
         //TODO
         return NULL;// new VspBspViewCellsManager();
-}
-
-
-}
+}*/
+
+
+}

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

@@ -170 +170 @@
         void AddViewCell(ViewCell *viewCell);
 
-        /** Derive view cells from objects. The view ells are created by taking the object
+        /** Derive view cells from scene objects. The view ells are created by taking the object
                 geometry into account.
         */
-        void DeriveViewCells(const ObjectContainer &objects, 
-                                                 ViewCellContainer &viewCells, 
-                                                 const int maxViewCells) const;
+        void DeriveViewCellsFromObjects(const ObjectContainer &objects, 
+                                                                        ViewCellContainer &viewCells, 
+                                                                        const int maxViewCells) const;
 
         /** Sets maximal number of samples used for the 
@@ -206 +206 @@
         int GetPostProcessSamples() const;
 
-        /** Returns true if view cells wer already constructed.
+        /** Returns true if view cells are already constructed.
         */
         virtual bool ViewCellsConstructed() const = 0;
@@ -405 +405 @@
         */
         float EvalRenderCost(Intersectable *obj) const;
-
    
-        
+        /** Sets pvs size of view cell as a scalar. Used when storing pvs only in the leaves
+                of the hierarchy.
+        */
+        inline void SetScalarPvsSize(ViewCell *vc, const int pvsSize) const;
+
+
         /** Returns bounding box of a view cell.
         */
@@ -420 +424 @@
         bool LoadBoundingBoxes(const string filename, IndexedBoundingBoxContainer &boxes) const;
 
-        bool GetExportPvs() const 
-        {
-                return mExportPvs;
-        }
+        /** Returns true if pvs should be exported together with the view cells.
+        */
+        bool GetExportPvs() const;
 
         /** Loads view cells from file. The view cells manager is created with 
                 respect to the loaded view cells.
 
+                @param filename the filename of the view cells
+                @param objects the scene objects
+                @param env an environment file containing more parameters
+                @param finalizeViewCells if the view cells should be post processed, i.e.
+                        a mesh is created representing the geometry
+                @param bconverter a conversion routine working with the similarities of bounding
+                boxes: if there is a certain similarity of overlap between bounding boxes, two tested
+                candidate objects are considered to be the same objects
                 @returns the view cells manager if loading was successful, false otherwise
         */
@@ -522 +533 @@
         virtual void ExportColor(Exporter *exporter, ViewCell *vc) const = 0;
 
-
+        /** Returns volume of the view space.
+        */
         virtual float GetViewSpaceVolume();
         
@@ -553 +565 @@
         virtual void UpdatePvsForEvaluation(ViewCell *root, ObjectPvs &pvs) = 0;
 
-
+        
         ////////////////////////////////////////////////
 
@@ -570 +582 @@
         /// Loaded view cells
         ViewCellContainer mViewCells;
-
+        /// the corresponding view cell tree holding the logical description of view cells
         ViewCellsTree *mViewCellsTree;
-
+        /// if empty view cells should be pruned (i.e., invalidated) from this point on
         bool mPruneEmptyViewCells;
 
+        /// if the pvss in the view cell leaves and the interiors are up to date
         bool mViewCellPvsIsUpdated;
+
         /// maximum number of samples taken for construction of the view cells
         int mConstructionSamples;
@@ -595 +609 @@
         bool mCompressViewCells;
 
+        /// holds the current view cell statistics
         ViewCellsStatistics mCurrentViewCellsStats;
         /// the scene bounding box
@@ -602 +617 @@
         bool mExportViewCells;
 
-        //bool mMarchTree);
+        // if only valid view cells should be considered for processing
         bool mOnlyValidViewCells;
 
         /// if rays should be used to collect merge candidates
         bool mUseRaysForMerge;
-        /// merge the view cells?
+        /// if there should be an additional merge step after the subdivision
         bool mMergeViewCells;
 
@@ -616 +631 @@
         //-- visualization options
         
-        /// color code for view cells
+        /// color code for view cells visualization
         int mColorCode;
         bool mExportGeometry;
@@ -638 +653 @@
         bool mExportPvs;
 
+        /// the pointer to the environment
         Environment *mEnvironment;
 };
-
 
 
@@ -729 +744 @@
         void ExportBspPvs(const ObjectContainer &objects);
 
+        /** test if subdivision is valid in terms of volume / area.
+        */
         void TestSubdivision();
 };
@@ -994 +1011 @@
                                           const VssRayContainer &rays);
 
+        /** test if subdivision is valid in terms of volume / area.
+        */
         void TestSubdivision();
 };
 
 
-class ViewCellsManagerFactory
+/*class ViewCellsManagerFactory
 {
-
 public:
-
         ViewCellsManager *Create(const string mName);
-
-};
+};*/
 
 }

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

@@ -317 +317 @@
                                 TransformedMeshInstance *mi = dynamic_cast<TransformedMeshInstance *>(object);
 
-                                if (!mi->GetMesh())
+                                if (!mi->GetMesh())     
                                         break;
-
-                                mesh = new Mesh(*mi->GetMesh());
-
-                                Matrix4x4 m;
-                                mi->GetWorldTransform(m);
-
-                                mesh->ApplyTransformation(m);
-
+                                mesh = new Mesh();
+                                mi->GetTransformedMesh(*mesh);
+                                
                 break;
                         }
@@ -375 +370 @@
         {
                 VssRay *ray = *rit;
+                Intersectable *obj = ray->mTerminationObject;
 
                 if ((mBox.IsInside(ray->mTermination) || !forcedBoundingBox) &&
-                        ray->mTerminationObject && 
-                        !ray->mTerminationObject->Mailed())
-                {
-                        ray->mTerminationObject->Mail();
-                        MeshInstance *obj = dynamic_cast<MeshInstance *>(ray->mTerminationObject);
-                        AddMeshToPolygons(obj->GetMesh(), polys, obj);
+                        obj && !obj->Mailed())
+                {
+                        obj->Mail();
+
+                        // transformed mesh instance and mesh instance handle mesh differently
+                        if (obj->Type() == Intersectable::TRANSFORMED_MESH_INSTANCE)
+                        {
+                                Mesh mesh;
+                                
+                                TransformedMeshInstance *tmobj = 
+                                        dynamic_cast<TransformedMeshInstance *>(obj);
+                                
+                                tmobj->GetTransformedMesh(mesh);
+                                AddMeshToPolygons(&mesh, polys, tmobj);
+                        }
+                        else // MeshInstance
+                        {
+                                MeshInstance *mobj = dynamic_cast<MeshInstance *>(obj);
+                                AddMeshToPolygons(mobj->GetMesh(), polys, mobj);
+                        }
+
                         ++ numObj;
 
@@ -815 +826 @@
                 AddToPvs(leaf, *tData.mRays, sampCon, conSamp);
 
-                // update single pvs parameter
-                viewCell->mPvsSize = viewCell->GetPvs().GetSize(); 
-                viewCell->mPvsSizeValid = true;
-
+                // update scalar pvs size lookup
+                mViewCellsManager->SetScalarPvsSize(viewCell, viewCell->GetPvs().GetSize());
+        
 
                 mBspStats.contributingSamples += conSamp;
@@ -950 +960 @@
                 AddToPvs(leaf, *tData.mRays, sampCon, conSamp);
 
-                viewCell->mPvsSize = viewCell->GetPvs().GetSize();
-                viewCell->mPvsSizeValid = true;
+                // update scalar pvs size value
+                mViewCellsManager->SetScalarPvsSize(viewCell, viewCell->GetPvs().GetSize());
 
                 mBspStats.contributingSamples += conSamp;
@@ -1161 +1171 @@
                                                   int &contributingSamples)
 {
-  sampleContributions = 0;
-  contributingSamples = 0;
+        sampleContributions = 0;
+        contributingSamples = 0;
   
-  RayInfoContainer::const_iterator it, it_end = rays.end();
+        RayInfoContainer::const_iterator it, it_end = rays.end();
   
-  ViewCellLeaf *vc = leaf->GetViewCell();
+        ViewCellLeaf *vc = leaf->GetViewCell();
   
-  // add contributions from samples to the PVS
-  for (it = rays.begin(); it != it_end; ++ it)
-        {
-          float sc = 0.0f;
-          VssRay *ray = (*it).mRay;
-          bool madeContrib = false;
-          float contribution;
-          if (ray->mTerminationObject) {
-                if (vc->GetPvs().AddSample(ray->mTerminationObject, ray->mPdf, contribution))
-                  madeContrib = true;
-                sc += contribution;
-          }
+        // add contributions from samples to the PVS
+        for (it = rays.begin(); it != it_end; ++ it)
+        {
+                float sc = 0.0f;
+                VssRay *ray = (*it).mRay;
+
+                bool madeContrib = false;
+                float contribution;
+
+                if (ray->mTerminationObject) 
+                {
+                        if (vc->AddPvsSample(ray->mTerminationObject, ray->mPdf, contribution))
+                                madeContrib = true;
+                        sc += contribution;
+                }
           
-          if (ray->mOriginObject) {
-                if (vc->GetPvs().AddSample(ray->mOriginObject, ray->mPdf, contribution))
-                  madeContrib = true;
-                sc += contribution;
-          }
+                if (ray->mOriginObject) 
+                {
+                        if (vc->AddPvsSample(ray->mOriginObject, ray->mPdf, contribution))
+                                madeContrib = true;
+                        sc += contribution;
+                }
           
           sampleContributions += sc;
+
           if (madeContrib)
                   ++ contributingSamples;
@@ -2635 +2650 @@
         // preprocess: throw out polygons coincident to the view space box (not needed)
         PolygonContainer boxPolys;
-        mBox.ExtractPolys(boxPolys);
+        /*mBox.ExtractPolys(boxPolys);
         vector<Plane3> boxPlanes;
 
@@ -2666 +2681 @@
         }
 
-        // remove deleted entries
+        // remove deleted entries after swapping them to end of vector
         for (int i = 0; i < (int)polys.size(); ++ i)
         {
@@ -2674 +2689 @@
                         polys.pop_back();
                 }
-        }
+        }*/
 }
 

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

@@ -22 +22 @@
 VssPreprocessor::VssPreprocessor():
   mPass(0),
-  mVssRays()
+  mVssRays(),
+  mViewSpaceBox(NULL)
 {
   // this should increase coherence of the samples
@@ -543 +544 @@
 
 
-  AxisAlignedBox3 *box = new AxisAlignedBox3(mKdTree->GetBox());
+  AxisAlignedBox3 box(mKdTree->GetBox());
   
   if (!useViewspacePlane) {
         float size = 0.05f;
         float s = 0.5f - size;
-        float olds = Magnitude(box->Size());
-        box->Enlarge(box->Size()*Vector3(-s));
+        float olds = Magnitude(box.Size());
+        box.Enlarge(box.Size()*Vector3(-s));
         Vector3 translation = Vector3(-olds*0.1f, 0, 0);
-        box->SetMin(box->Min() + translation);
-        box->SetMax(box->Max() + translation);
+        box.SetMin(box.Min() + translation);
+        box.SetMax(box.Max() + translation);
   } else {
 
         // sample city like heights
-        box->SetMin(1, box->Min(1) + box->Size(1)*0.2f);
-        box->SetMax(1, box->Min(1) + box->Size(1)*0.3f);
+        box.SetMin(1, box.Min(1) + box.Size(1)*0.2f);
+        box.SetMax(1, box.Min(1) + box.Size(1)*0.3f);
   }
 
   if (use2dSampling)
-        box->SetMax(1, box->Min(1));
+        box.SetMax(1, box.Min(1));
 
   cout<<"mUseViewSpaceBox="<<mUseViewSpaceBox<<endl;
@@ -570 +571 @@
           if (!mEnlargeViewSpace)
           {
-                  mViewSpaceBox = box;
+                  mViewSpaceBox = new AxisAlignedBox3(box);
           }
           else
@@ -591 +592 @@
                   {
                           // $$ JB temporary
-                          AxisAlignedBox3 box = *mViewSpaceBox;
+                          AxisAlignedBox3 tempbox = *mViewSpaceBox;
                           
-                          float s = box.Size(0);
+                          float s = tempbox.Size(0);
                           
-                          box.Scale(0.8f);
-                          box.SetMax(0, box.Max(0) + s*0.8f);
-                          box.SetMin(0, box.Min(0) + s*0.8f);
-                          *mViewSpaceBox = box;
+                          tempbox.Scale(0.8f);
+                          tempbox.SetMax(0, box.Max(0) + s*0.8f);
+                          tempbox.SetMin(0, box.Min(0) + s*0.8f);
+                          *mViewSpaceBox = tempbox;
                   }             
           }

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

@@ -275 +275 @@
                 MeshInstance *mi;
 
-                if (0 && !mUsingMeshDefinition) 
+                if (!mUsingMeshDefinition) 
                 {
                         // make an instance of this mesh

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

@@ -10 +10 @@
 #include "MeshKdTree.h"
 #include "Exporter.h"
-#include "X3dExporter.h" // delete later
 #include "ViewCell.h"
 #include "SceneGraph.h"
@@ -49 +48 @@
   environment->GetStringValue("Preprocessor.type", buff);
   string preprocessorType(buff);
-        
-  Preprocessor *p;
 
+  Preprocessor *p = NULL;
+
+ 
   if (preprocessorType == "vss")
   {
@@ -57 +57 @@
   }
   else
+  {
         if (preprocessorType == "rss")
-          p = new RssPreprocessor();
+        {
+                p = new RssPreprocessor();
+        }
         else
+        {
           if (preprocessorType == "exact")
+          {
                 p = new ExactPreprocessor();
+          }
           else
+          {
                 if (preprocessorType == "sampling")
+                {
                   p = new SamplingPreprocessor();
+                }
                 else
+                {       
                   if (preprocessorType == "render")
                   {
-                          p = new RenderSampler();
+                         p = new RenderSampler();
                   }
                   else {
-                        cerr<<"Unknown preprocessor type"<<endl;
-                        Debug<<"Unknown preprocessor type"<<endl;
-                        exit(1);
+                          DEL_PTR(environment);
+                          cerr<<"Unknown preprocessor type"<<endl;
+                          Debug<<"Unknown preprocessor type"<<endl;
+                          exit(1);
                   }
+                }
+          }
+        }
+  }
   
- 
+
   QApplication *app = NULL;
 
@@ -149 +164 @@
          returnCode = app->exec();
 
-   // clean up
+  //-- clean up
   DEL_PTR(p);
   DEL_PTR(environment);
+
   MeshManager::DelSingleton();
   MaterialManager::DelSingleton();
 
+  DEL_PTR(pt);
 
   return returnCode;