Changeset 182 for trunk/VUT/GtpVisibilityPreprocessor/src

Timestamp:

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

Author:

mattausch

Message:

the code is compiling under .net now

Location:

trunk/VUT/GtpVisibilityPreprocessor/src

Files:

• Camera.cpp (modified) (3 diffs)
• X3dParser.cpp (modified) (1 diff)

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"