Changeset 1751 for GTP/trunk/Lib/Vis

Timestamp:

11/14/06 23:42:04 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Pvs.h (modified) (2 diffs)
• TestPreprocessor.vcproj (modified) (1 diff)
• ViewCellsManager.cpp (modified) (1 diff)

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

@@ -385 +385 @@
 void Pvs<T, S>::MergeInPlace(const Pvs<T, S> &a)
 {
-    const int samples = mSamples + a.mSamples;
-
+    //const int samples = mSamples + a.mSamples;
         ObjectPvs interPvs;
         
@@ -393 +392 @@
         mEntries.reserve(interPvs.GetSize());
         mEntries = interPvs.mEntries;
-
-        mSamples = samples;
+        mSamples = interPvs.mSamples;
+        //mSamples = samples;
 }
 

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/Preprocessor2.exe"
+                                OutputFile="../bin/release/Preprocessor.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/ViewCellsManager.cpp

@@ -2615 +2615 @@
   float samples = (float)pvs.GetSamples();
   cout<<"Samples = "<<samples<<endl;
-   cout<<"size = "<<pvs.GetSize() <<endl;
+   cout<<"pvs size = "<<pvs.GetSize() <<endl;
   //  cout<<"Filter size = "<<filterSize<<endl;
   //  cout<<"vbox = "<<vbox<<endl;