Changeset 9977 in orxonox.OLD for branches/playability/src
- Timestamp:
- Nov 29, 2006, 5:24:18 PM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/playability/src/world_entities/test_entity2.cc
r9976 r9977 114 114 //PRINTF(0)("axis: %f\n", axis); 115 115 116 <<<<<<< .mine117 glColor3f(1.0, 0.0, 0.0);118 =======119 116 this->material->select(); 120 >>>>>>> .r9974121 117 122 118 glColor3f(0.0, 1.0, 0.0); 123 119 124 120 glBegin(GL_QUADS); 125 <<<<<<< .mine 126 glVertex3f( 0.0f, 10.0f, 0.0f); 127 //glNormal3f(0.0, 1.0, 0.0); 128 ======= 121 129 122 glVertex3f( 0.0f, -10.0f, 0.0f); 130 123 glNormal3f(1.0, 0.0, 0.0); 131 >>>>>>> .r9974132 124 // 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 137 126 glVertex3f( 0.0f, -10.0f , 20.0f); 138 127 glNormal3f(1.0, 0.0, 0.0); 139 >>>>>>> .r9974 128 140 129 141 130 // 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 146 132 glVertex3f( 0.0, 10.0f , 20.0f ); 147 133 glNormal3f(1.0, 0.0, 0.0); 148 >>>>>>> .r9974 134 149 135 150 136 // 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 155 138 glVertex3f( 0.0, 10.0f, 0.0f ); 156 139 glNormal3f(1.0, 0.0, 0.0); 157 >>>>>>> .r9974 140 158 141 159 142 // glTexCoord2f(1.0f, 0.0f); 160 <<<<<<< .mine161 =======162 143 163 >>>>>>> .r9974164 144 glEnd(); 165 145
Note: See TracChangeset
for help on using the changeset viewer.