Changeset 182 for trunk/VUT

Timestamp:

07/19/05 13:32:59 (19 years ago)

Author:

mattausch

Message:

the code is compiling under .net now

Location:

trunk/VUT/GtpVisibilityPreprocessor

Files:

• scripts/Preprocessor.vcproj (modified) (6 diffs)
• src/Camera.cpp (modified) (3 diffs)
• src/X3dParser.cpp (modified) (1 diff)

trunk/VUT/GtpVisibilityPreprocessor/scripts/Preprocessor.vcproj

@@ -58 +58 @@
                         OutputDirectory="..\bin\$(ConfigurationName)"
                         IntermediateDirectory="..\obj\$(ConfigurationName)"
-                        ConfigurationType="4"
+                        ConfigurationType="1"
                         CharacterSet="2">
                         <Tool
@@ -72 +72 @@
                                 Name="VCCustomBuildTool"/>
                         <Tool
-                                Name="VCLibrarianTool"
-                                OutputFile="$(OutDir)/GtpVisibility.lib"/>
+                                Name="VCLinkerTool"
+                                AdditionalDependencies="xerces-c_2.lib zdll.lib zziplib.lib"
+                                AdditionalLibraryDirectories="&quot;$(XERCES_PATH)\lib\$(ConfigurationName)&quot;;&quot;$(ZLIB_PATH)\lib\$(ConfigurationName)&quot;;&quot;$(QTDIR)\lib&quot;"/>
                         <Tool
                                 Name="VCMIDLTool"/>
@@ -88 +89 @@
                         <Tool
                                 Name="VCXMLDataGeneratorTool"/>
+                        <Tool
+                                Name="VCWebDeploymentTool"/>
                         <Tool
                                 Name="VCManagedWrapperGeneratorTool"/>
@@ -177 +180 @@
                         </File>
                         <File
+                                RelativePath="..\src\MeshKdTree.cpp">
+                        </File>
+                        <File
+                                RelativePath="..\src\MeshKdTree.h">
+                        </File>
+                        <File
                                 RelativePath="..\src\Parser.h">
                         </File>
@@ -189 +198 @@
                         </File>
                         <File
+                                RelativePath="..\src\Pvs.cpp">
+                        </File>
+                        <File
+                                RelativePath="..\src\Pvs.h">
+                        </File>
+                        <File
                                 RelativePath="..\src\Ray.cpp">
                         </File>
@@ -235 +250 @@
                         <File
                                 RelativePath="..\src\X3dParser.h">
+                        </File>
+                        <File
+                                RelativePath="..\src\X3dParserXerces.h">
                         </File>
                 </Filter>

trunk/VUT/GtpVisibilityPreprocessor/src/Camera.cpp

@@ -22 +22 @@
   QImage image(mWidth, mHeight, 32);
 #else
-  QImage image(mWidth, mHeight, QImage::Format_RGB32);
+  //QImage image(mWidth, mHeight, QImage::Format_RGB32);
 #endif
   
@@ -41 +41 @@
           if (mesh->GetMesh()->mMaterial)
             color = mesh->GetMesh()->mMaterial->mDiffuseColor;
+#if QT_VERSION < 0x040000
           image.setPixel(x, y, qRgb(color.r*255,
                                     color.g*255,
                                     color.b*255
                                     ));
+#endif
+
         }
       
@@ -57 +60 @@
   
   cout<<"Saving image"<<endl;
+#if QT_VERSION < 0x040000
   image.save(filename.c_str(), "PNG");
-
+#endif
   Exporter *exporter = NULL;
   if (exportRays) {

trunk/VUT/GtpVisibilityPreprocessor/src/X3dParser.cpp

@@ -24 +24 @@
 #include "X3dParser.h"
 
-//#include "X3dParserXerces.h"
+#include "X3dParserXerces.h"
 #include "Mesh.h"
 #include "SceneGraph.h"