Changeset 1901 in orxonox.OLD for orxonox/branches/showroom

Timestamp:

May 23, 2004, 11:24:47 PM (21 years ago)

Author:

patrick

Message:

ported showroom to linux - haleluja

Location:

orxonox/branches/showroom/Showroom

Files:

• 3dStructs.cpp (modified) (2 diffs)
• 3dStructs.h (modified) (1 diff)
• 3dUnit.cpp (modified) (2 diffs)
• 3ds.cpp (modified) (3 diffs)
• Makefile (added)
• linuxFixesPB.txt (added)
• showroom.cpp (modified) (1 diff)

orxonox/branches/showroom/Showroom/3dStructs.cpp

@@ -3 +3 @@
 
 /* Debugging*/
-#include <iostream.h>
+#include <iostream>
 
+using namespace std;
 
 void C3dModel::Draw(int g_ViewMode)
@@ -70 +71 @@
                                                 {
                                                         // Get and set the color that the object is, since it must not have a texture
-                                                        BYTE *pColor = pMaterials[pObject[i].materialID].color;
+                                                        /* linuxFix pb: BYTE not knonw */
+                                                        int *pColor = pMaterials[pObject[i].materialID].color;
 
                                                         // Assign the current color to this model

orxonox/branches/showroom/Showroom/3dStructs.h

@@ -40 +40 @@
         char  strName[255];             /* The texture name */
         char  strFile[255];             /* The texture file name */
-        BYTE  color[3];                 /* The color of the object (R, G, B) */
+        /* pb fix: BYTE -> int */
+        int  color[3];                  /* The color of the object (R, G, B) */
         int   texureId;                 /* the texture ID */
         float uTile;                            /* u tiling of texture  (Currently not used) */

orxonox/branches/showroom/Showroom/3dUnit.cpp

@@ -52 +52 @@
    /* Draws the Model. If none has been loaded, print an error */
    if( b3dModelLoaded ) CModel.Draw( mode );
-   else printf( "No Model for Unit %s loaded!", sName );   
+   else printf( "No Model for Unit %s loaded!\n", sName );   
 }
 
@@ -60 +60 @@
    if( b3dModelLoaded )
       CModel.PrintProperties();
-   else printf( "No Model for Unit %s loaded!", sName );
+   else printf( "No Model for Unit %s loaded!\n", sName );
 }
 

orxonox/branches/showroom/Showroom/3ds.cpp

@@ -56 +56 @@
         {
                 sprintf(strMessage, "Unable to find the file: %s!", strFileName);
-                MessageBox(NULL, strMessage, "Error", MB_OK);
+                /* linuxFix by pb: no MessageBox known by linux */
+                //MessageBox(NULL, strMessage, "Error", MB_OK);
                 return false;
         }
@@ -71 +72 @@
         {
                 sprintf(strMessage, "Unable to load PRIMARY chuck from file: %s!", strFileName);
-                MessageBox(NULL, strMessage, "Error", MB_OK);
+                /* linuxFix by pb: MessageBox not known... */
+                //MessageBox(NULL, strMessage, "Error", MB_OK);
                 return false;
         }
@@ -146 +148 @@
                         // If the file version is over 3, give a warning that there could be a problem
                         if ((currentChunk.length - currentChunk.bytesRead == 4) && (gBuffer[0] > 0x03)) {
-                                MessageBox(NULL, "This 3DS file is over version 3 so it may load incorrectly", "Warning", MB_OK);
+                        /* linuxFix by pb: MessageBox not know, using cout */
+                                //MessageBox(NULL, "This 3DS file is over version 3 so it may load incorrectly", "Warning", MB_OK);
+                                 //sprintf("This 3DS file is over version 3 so it may load incorrectly");
                         }
                         break;

orxonox/branches/showroom/Showroom/showroom.cpp

@@ -109 +109 @@
     glMatrixMode( GL_MODELVIEW);
 }
+
+
+
+int main(int argc, char** argv )
+{
+    showroom(argc, argv);
+    return 0;
+}
+
+