Changeset 2656

Timestamp:

04/22/08 02:40:51 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis

Files:

• GtpVisibility05.sln (modified) (2 diffs)
• Preprocessing/src/GtpVisibility05.vcproj (modified) (11 diffs)
• Preprocessing/src/Preprocessor.vcproj (modified) (1 diff)
• Preprocessing/src/QtInterface/LogWriter.h (modified) (1 diff)
• Preprocessing/src/QtInterface/QtGlRenderer.h (modified) (4 diffs)
• Preprocessing/src/QtInterface/QtGlViewer.h (modified) (1 diff)
• Preprocessing/src/QtInterface/QtInterface05.vcproj (modified) (4 diffs)
• Preprocessing/src/QtInterface/QtPreprocessorThread.h (modified) (3 diffs)
• Preprocessing/src/TestPreprocessor05.vcproj (added)
• Preprocessing/src/havran/testrt.cpp (modified) (1 diff)

GTP/trunk/Lib/Vis/GtpVisibility05.sln

@@ -4 +4 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Preprocessor05", "Preprocessing\src\GtpVisibility05.vcproj", "{3C8C3818-EB24-47D4-A04E-18D5255A2B2F}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QtInterface05", "Preprocessing\src\QtInterface\QtInterface05.vcproj", "{C3F67E6E-09C2-4919-A003-90E9C42DCEA7}"
+        ProjectSection(ProjectDependencies) = postProject
+                {3C8C3818-EB24-47D4-A04E-18D5255A2B2F} = {3C8C3818-EB24-47D4-A04E-18D5255A2B2F}
+        EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestPreprocessor05", "Preprocessing\src\TestPreprocessor05.vcproj", "{69BC58F0-C7EB-4B43-B782-B6F047EF0528}"
+        ProjectSection(ProjectDependencies) = postProject
+                {C3F67E6E-09C2-4919-A003-90E9C42DCEA7} = {C3F67E6E-09C2-4919-A003-90E9C42DCEA7}
+                {3C8C3818-EB24-47D4-A04E-18D5255A2B2F} = {3C8C3818-EB24-47D4-A04E-18D5255A2B2F}
+        EndProjectSection
+EndProject
 Global
         GlobalSection(SolutionConfigurationPlatforms) = preSolution
                 Debug|Win32 = Debug|Win32
+                Release Internal|Win32 = Release Internal|Win32
+                release_noqt|Win32 = release_noqt|Win32
+                Release_qt|Win32 = Release_qt|Win32
                 Release|Win32 = Release|Win32
         EndGlobalSection
@@ -12 +26 @@
                 {3C8C3818-EB24-47D4-A04E-18D5255A2B2F}.Debug|Win32.ActiveCfg = Debug|Win32
                 {3C8C3818-EB24-47D4-A04E-18D5255A2B2F}.Debug|Win32.Build.0 = Debug|Win32
+                {3C8C3818-EB24-47D4-A04E-18D5255A2B2F}.Release Internal|Win32.ActiveCfg = Release|Win32
+                {3C8C3818-EB24-47D4-A04E-18D5255A2B2F}.Release Internal|Win32.Build.0 = Release|Win32
+                {3C8C3818-EB24-47D4-A04E-18D5255A2B2F}.release_noqt|Win32.ActiveCfg = Release|Win32
+                {3C8C3818-EB24-47D4-A04E-18D5255A2B2F}.release_noqt|Win32.Build.0 = Release|Win32
+                {3C8C3818-EB24-47D4-A04E-18D5255A2B2F}.Release_qt|Win32.ActiveCfg = Release|Win32
+                {3C8C3818-EB24-47D4-A04E-18D5255A2B2F}.Release_qt|Win32.Build.0 = Release|Win32
                 {3C8C3818-EB24-47D4-A04E-18D5255A2B2F}.Release|Win32.ActiveCfg = Release|Win32
                 {3C8C3818-EB24-47D4-A04E-18D5255A2B2F}.Release|Win32.Build.0 = Release|Win32
+                {C3F67E6E-09C2-4919-A003-90E9C42DCEA7}.Debug|Win32.ActiveCfg = Debug|Win32
+                {C3F67E6E-09C2-4919-A003-90E9C42DCEA7}.Debug|Win32.Build.0 = Debug|Win32
+                {C3F67E6E-09C2-4919-A003-90E9C42DCEA7}.Release Internal|Win32.ActiveCfg = Release|Win32
+                {C3F67E6E-09C2-4919-A003-90E9C42DCEA7}.Release Internal|Win32.Build.0 = Release|Win32
+                {C3F67E6E-09C2-4919-A003-90E9C42DCEA7}.release_noqt|Win32.ActiveCfg = Release|Win32
+                {C3F67E6E-09C2-4919-A003-90E9C42DCEA7}.release_noqt|Win32.Build.0 = Release|Win32
+                {C3F67E6E-09C2-4919-A003-90E9C42DCEA7}.Release_qt|Win32.ActiveCfg = Release|Win32
+                {C3F67E6E-09C2-4919-A003-90E9C42DCEA7}.Release_qt|Win32.Build.0 = Release|Win32
+                {C3F67E6E-09C2-4919-A003-90E9C42DCEA7}.Release|Win32.ActiveCfg = Release|Win32
+                {C3F67E6E-09C2-4919-A003-90E9C42DCEA7}.Release|Win32.Build.0 = Release|Win32
+                {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.Debug|Win32.ActiveCfg = Debug|Win32
+                {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.Debug|Win32.Build.0 = Debug|Win32
+                {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.Release Internal|Win32.ActiveCfg = Release|Win32
+                {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.Release Internal|Win32.Build.0 = Release|Win32
+                {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.release_noqt|Win32.ActiveCfg = Release|Win32
+                {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.release_noqt|Win32.Build.0 = Release|Win32
+                {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.Release_qt|Win32.ActiveCfg = Release|Win32
+                {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.Release_qt|Win32.Build.0 = Release|Win32
+                {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.Release|Win32.ActiveCfg = Release|Win32
+                {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.Release|Win32.Build.0 = Release|Win32
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution

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

@@ -92 +92 @@
                 <Configuration
                         Name="Release|Win32"
-                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                        IntermediateDirectory="$(ConfigurationName)"
+                        OutputDirectory="$(SolutionDir)\lib05\$(ConfigurationName)"
+                        IntermediateDirectory="$(SolutionDir)\obj05\$(ConfigurationName)"
                         ConfigurationType="4"
                         CharacterSet="2"
@@ -115 +115 @@
                         <Tool
                                 Name="VCCLCompilerTool"
-                                AdditionalIncludeDirectories="..\src;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\..\..\..\..\NonGTP\Boost;Timer;..\src\havran"
-                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;NO_QT;USE_VERBOSE_PVS"
+                                AdditionalIncludeDirectories="..\src;Timer;..\..\..\..\..\..\NonGTP\Devil\include;..\..\..\..\..\..\NonGTP\Zlib\include;..\..\..\..\..\..\NonGTP\Xerces;..\..\..\..\..\..\NonGTP\Boost;..\src\havran;..\MultiLevelRayTracing;&quot;$(CG_INC_PATH)&quot;"
+                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USE_VERBOSE_PVS;USE_QT;GTP_INTERNAL;USE_CG"
                                 RuntimeLibrary="2"
                                 WarningLevel="3"
@@ -168 +168 @@
                         </File>
                         <File
+                                RelativePath=".\Timer\BenchTimer.cpp"
+                                >
+                        </File>
+                        <File
                                 RelativePath=".\BitVectorPvs.cpp"
                                 >
@@ -284 +288 @@
                         </File>
                         <File
+                                RelativePath=".\Timer\merror.cpp"
+                                >
+                        </File>
+                        <File
                                 RelativePath=".\Mesh.cpp"
                                 >
@@ -369 +377 @@
                         <File
                                 RelativePath=".\RayInfo.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath=".\Timer\RDTSCTimer.cpp"
                                 >
                         </File>
@@ -514 +526 @@
                         </File>
                         <File
+                                RelativePath=".\Timer\BenchTimer.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath=".\BitVectorPvs.h"
                                 >
@@ -662 +678 @@
                         </File>
                         <File
+                                RelativePath=".\Timer\merror.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath=".\Mesh.h"
                                 >
@@ -670 +690 @@
                         </File>
                         <File
+                                RelativePath=".\Timer\mstring.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath=".\Mutation.h"
                                 >
@@ -710 +734 @@
                         </File>
                         <File
+                                RelativePath=".\Timer\PerfTimer.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath=".\Timer\PerfTimerSkeleton.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath=".\Plane3.h"
                                 >
@@ -774 +806 @@
                         </File>
                         <File
+                                RelativePath=".\Timer\RDTSCTimer.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath=".\Rectangle3.h"
                                 >
@@ -925 +961 @@
                                 >
                         </File>
-                </Filter>
-                <Filter
-                        Name="Resource Files"
-                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-                        >
                 </Filter>
                 <Filter

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

@@ -108 +108 @@
                 <Configuration
                         Name="Release Internal|Win32"
-                        OutputDirectory="..\libRelease"
+                        OutputDirectory="..\lib\Release"
                         IntermediateDirectory="..\obj\Release"
                         ConfigurationType="4"

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/LogWriter.h

@@ -13 +13 @@
 {
 
-//class ViewCellContainer;
 
 class LogWriter

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtGlRenderer.h

@@ -49 +49 @@
 
 
-class QtGlRendererBuffer : public QObject, public QGLPixelBuffer, public GlRendererBuffer
+class __declspec(dllexport) QtGlRendererBuffer
+: public QObject, public QGLPixelBuffer, public GlRendererBuffer
 {
         Q_OBJECT
@@ -86 +87 @@
 
 
-class QtRendererControlWidget : public QWidget
+class __declspec(dllexport) QtRendererControlWidget : public QWidget
 {
   Q_OBJECT
@@ -169 +170 @@
 
 
-class QtGlRendererWidget: public QGLWidget, public GlRendererWidget
+class __declspec(dllexport) QtGlRendererWidget: public QGLWidget, public GlRendererWidget
 {
         Q_OBJECT
@@ -568 +569 @@
 
 
-class QtGlDebuggerWidget: public QGLWidget
+class __declspec(dllexport) QtGlDebuggerWidget: public QGLWidget
 {
         Q_OBJECT

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtGlViewer.h

@@ -13 +13 @@
 
 
-class QtGlViewer : public QGLWidget
+class __declspec(dllexport) QtGlViewer : public QGLWidget
 {
         //Q_OBJECT

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtInterface05.vcproj

@@ -80 +80 @@
                 <Configuration
                         Name="Release|Win32"
-                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                        IntermediateDirectory="$(ConfigurationName)"
+                        OutputDirectory="$(SolutionDir)\lib05\$(ConfigurationName)"
+                        IntermediateDirectory="$(SolutionDir)\obj05\$(ConfigurationName)"
                         ConfigurationType="4"
                         CharacterSet="1"
@@ -103 +103 @@
                         <Tool
                                 Name="VCCLCompilerTool"
-                                AdditionalIncludeDirectories="..\src;&quot;$(QT_PATH)\include\QtOpenGL&quot;;..\..\src\;&quot;$(QT_PATH)\include\Qt&quot;"
-                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+                                WholeProgramOptimization="false"
+                                AdditionalIncludeDirectories="..\src;..\..\src\;..\..\..\..\..\..\..\NonGTP\Zlib\include;&quot;$(QTDIR)\include\QtOpenGL&quot;;&quot;$(QTDIR)\include\Qt&quot;;&quot;$(QTDIR)\include\QtGui&quot;;&quot;$(QTDIR)\include\QtCore&quot;;&quot;$(QTDIR)\include&quot;;&quot;$(CG_INC_PATH)&quot;"
+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GTP_INTERNAL;USE_QT;USE_VERBOSE_PVS;USE_CG"
                                 RuntimeLibrary="2"
                                 UsePrecompiledHeader="0"
@@ -149 +150 @@
                         >
                         <File
-                                RelativePath="LogReader.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath="LogWriter.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath="QtGlRenderer.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath="QtGlViewer.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath="QtPreprocessorThread.h"
+                                RelativePath="LogReader.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="LogWriter.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath=".\moc_QtGlRenderer.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="QtGlRenderer.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="QtGlRendererDll.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="QtGlViewer.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="QtPreprocessorThread.cpp"
                                 >
                         </File>
@@ -175 +184 @@
                         >
                         <File
-                                RelativePath="LogReader.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath="LogWriter.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath="QtGlRenderer.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath="QtGlRendererDll.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath="QtGlViewer.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath="QtPreprocessorThread.cpp"
+                                RelativePath="LogReader.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="LogWriter.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="QtGlRenderer.h"
+                                >
+                                <FileConfiguration
+                                        Name="Release|Win32"
+                                        >
+                                        <Tool
+                                                Name="VCCustomBuildTool"
+                                                Description="Performing moc on $(InputName).h"
+                                                CommandLine="$(QTDIR)\bin\moc.exe $(InputDir)$(InputName).h -o $(InputDir)moc_$(InputName).cpp&#x0D;&#x0A;"
+                                                Outputs="&quot;$(InputDir) moc_$(InputName).cpp"
+                                        />
+                                </FileConfiguration>
+                        </File>
+                        <File
+                                RelativePath="QtGlViewer.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="QtPreprocessorThread.h"
                                 >
                         </File>
                 </Filter>
-                <File
-                        RelativePath=".\ReadMe.txt"
-                        >
-                </File>
         </Files>
         <Globals>

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtPreprocessorThread.h

@@ -2 +2 @@
 #define __QT_PREPROCESSOR_THREAD_H
 
-#ifdef USE_QT
+//#ifdef USE_QT
 
 #include <QThread>
@@ -11 +11 @@
 class Preprocessor;
 
-class QtPreprocessorThread : public PreprocessorThread, public QThread
+class __declspec(dllexport) QtPreprocessorThread : public PreprocessorThread, public QThread
 {
 public:
@@ -36 +36 @@
 
 #endif
-#endif
+//#endif

GTP/trunk/Lib/Vis/Preprocessing/src/havran/testrt.cpp

@@ -34 +34 @@
 
 #ifdef USE_QT  
-        #include "QtPreprocessorThread.h"
+/*      #include "QtPreprocessorThread.h"
         #include "QtGlViewer.h"
         #include "QtGlRenderer.h"
+        */
 #else
         #if USE_THREADS