Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9977 in orxonox.OLD for branches/playability/src


Ignore:
Timestamp:
Nov 29, 2006, 5:24:18 PM (18 years ago)
Author:
nicolasc
Message:

bump

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/playability/src/world_entities/test_entity2.cc

    r9976 r9977  
    114114//PRINTF(0)("axis: %f\n", axis);
    115115
    116 <<<<<<< .mine
    117   glColor3f(1.0, 0.0, 0.0);
    118 =======
    119116    this->material->select();
    120 >>>>>>> .r9974
    121117
    122118  glColor3f(0.0, 1.0, 0.0);
    123119
    124120  glBegin(GL_QUADS);
    125 <<<<<<< .mine
    126     glVertex3f( 0.0f, 10.0f, 0.0f);
    127     //glNormal3f(0.0, 1.0, 0.0);
    128 =======
     121
    129122    glVertex3f( 0.0f, -10.0f, 0.0f);
    130123    glNormal3f(1.0, 0.0, 0.0);
    131 >>>>>>> .r9974
    132124//     glTexCoord2f(1.0f, 1.0f);
    133 <<<<<<< .mine
    134     glVertex3f( 0.0f,  10.0f , 10.0f);
    135     //glNormal3f(0.0, 1.0, 0.0);
    136 =======
     125
    137126    glVertex3f( 0.0f,  -10.0f , 20.0f);
    138127    glNormal3f(1.0, 0.0, 0.0);
    139 >>>>>>> .r9974
     128
    140129
    141130//     glTexCoord2f(0.0f, 1.0f);
    142 <<<<<<< .mine
    143     glVertex3f( 0.0f,  0.0f , 10.0f );
    144     //glNormal3f(0.0, 1.0, 0.0);
    145 =======
     131
    146132    glVertex3f( 0.0,  10.0f , 20.0f );
    147133    glNormal3f(1.0, 0.0, 0.0);
    148 >>>>>>> .r9974
     134
    149135
    150136//     glTexCoord2f(0.0f, 0.0f);
    151 <<<<<<< .mine
    152     glVertex3f( 0.0f, 0.0f, 0.0f );
    153     //glNormal3f(1.0, 0.0, 0.0);
    154 =======
     137
    155138    glVertex3f( 0.0, 10.0f, 0.0f );
    156139    glNormal3f(1.0, 0.0, 0.0);
    157 >>>>>>> .r9974
     140
    158141
    159142//     glTexCoord2f(1.0f, 0.0f);
    160 <<<<<<< .mine
    161 =======
    162143
    163 >>>>>>> .r9974
    164144  glEnd();
    165145
Note: See TracChangeset for help on using the changeset viewer.