Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1901 in orxonox.OLD for orxonox/branches


Ignore:
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:
2 added
5 edited

Legend:

Unmodified
Added
Removed
  • orxonox/branches/showroom/Showroom/3dStructs.cpp

    r1869 r1901  
    33
    44/* Debugging*/
    5 #include <iostream.h>
     5#include <iostream>
    66
     7using namespace std;
    78
    89void C3dModel::Draw(int g_ViewMode)
     
    7071                                                {
    7172                                                        // Get and set the color that the object is, since it must not have a texture
    72                                                         BYTE *pColor = pMaterials[pObject[i].materialID].color;
     73                                                        /* linuxFix pb: BYTE not knonw */
     74                                                        int *pColor = pMaterials[pObject[i].materialID].color;
    7375
    7476                                                        // Assign the current color to this model
  • orxonox/branches/showroom/Showroom/3dStructs.h

    r1870 r1901  
    4040        char  strName[255];             /* The texture name */
    4141        char  strFile[255];             /* The texture file name */
    42         BYTE  color[3];                 /* The color of the object (R, G, B) */
     42        /* pb fix: BYTE -> int */
     43        int  color[3];                  /* The color of the object (R, G, B) */
    4344        int   texureId;                 /* the texture ID */
    4445        float uTile;                            /* u tiling of texture  (Currently not used) */
  • orxonox/branches/showroom/Showroom/3dUnit.cpp

    r1869 r1901  
    5252   /* Draws the Model. If none has been loaded, print an error */
    5353   if( b3dModelLoaded ) CModel.Draw( mode );
    54    else printf( "No Model for Unit %s loaded!", sName );   
     54   else printf( "No Model for Unit %s loaded!\n", sName );   
    5555}
    5656
     
    6060   if( b3dModelLoaded )
    6161      CModel.PrintProperties();
    62    else printf( "No Model for Unit %s loaded!", sName );
     62   else printf( "No Model for Unit %s loaded!\n", sName );
    6363}
    6464
  • orxonox/branches/showroom/Showroom/3ds.cpp

    r1869 r1901  
    5656        {
    5757                sprintf(strMessage, "Unable to find the file: %s!", strFileName);
    58                 MessageBox(NULL, strMessage, "Error", MB_OK);
     58                /* linuxFix by pb: no MessageBox known by linux */
     59                //MessageBox(NULL, strMessage, "Error", MB_OK);
    5960                return false;
    6061        }
     
    7172        {
    7273                sprintf(strMessage, "Unable to load PRIMARY chuck from file: %s!", strFileName);
    73                 MessageBox(NULL, strMessage, "Error", MB_OK);
     74                /* linuxFix by pb: MessageBox not known... */
     75                //MessageBox(NULL, strMessage, "Error", MB_OK);
    7476                return false;
    7577        }
     
    146148                        // If the file version is over 3, give a warning that there could be a problem
    147149                        if ((currentChunk.length - currentChunk.bytesRead == 4) && (gBuffer[0] > 0x03)) {
    148                                 MessageBox(NULL, "This 3DS file is over version 3 so it may load incorrectly", "Warning", MB_OK);
     150                        /* linuxFix by pb: MessageBox not know, using cout */
     151                                //MessageBox(NULL, "This 3DS file is over version 3 so it may load incorrectly", "Warning", MB_OK);
     152                                 //sprintf("This 3DS file is over version 3 so it may load incorrectly");
    149153                        }
    150154                        break;
  • orxonox/branches/showroom/Showroom/showroom.cpp

    r1869 r1901  
    109109    glMatrixMode( GL_MODELVIEW);
    110110}
     111
     112
     113
     114int main(int argc, char** argv )
     115{
     116    showroom(argc, argv);
     117    return 0;
     118}
     119
     120
Note: See TracChangeset for help on using the changeset viewer.