Commit d59f387c34aa291ca86fa12f90412284661086f0
1 parent
2d655351
Revert "fixed a bug"
This reverts commit 2d65535118323a906c0608ed48a90a5097a5aeed.
Showing
2 changed files
with
10 additions
and
11 deletions
Show diff stats
TextureTest.cu
| ... | ... | @@ -76,7 +76,7 @@ glInit() |
| 76 | 76 | glLoadIdentity(); |
| 77 | 77 | glOrtho(-5.0, 2.0,-5.0, 2.0, -0.0, 1000.0); |
| 78 | 78 | glMatrixMode(GL_MODELVIEW); |
| 79 | - spidey = stim::gl_spider<float>(0.5, 0.5, 0.5, -0.1, -0.1, -0.1, 0.5, 0.5); | |
| 79 | + spidey = stim::gl_spider<float>(0.5, 0.5, 0.5, 0.1, 0.1, 0.1, 0.5, 0.5); | |
| 80 | 80 | CHECK_OPENGL_ERROR |
| 81 | 81 | } |
| 82 | 82 | |
| ... | ... | @@ -101,8 +101,8 @@ void |
| 101 | 101 | DrawPlanes() |
| 102 | 102 | { |
| 103 | 103 | p1 = spidey.ver.p(0,0); |
| 104 | - p2 = spidey.ver.p(1,0); | |
| 105 | - p3 = spidey.ver.p(0,1); | |
| 104 | + p2 = spidey.ver.p(0,1); | |
| 105 | + p3 = spidey.ver.p(1,0); | |
| 106 | 106 | p4 = spidey.ver.p(1,1); |
| 107 | 107 | glPushName(VERTICAL); |
| 108 | 108 | glBegin(GL_QUADS); |
| ... | ... | @@ -149,8 +149,8 @@ DrawPlanes() |
| 149 | 149 | glEnd(); |
| 150 | 150 | glPopName(); |
| 151 | 151 | p1 = spidey.hor.p(0,0); |
| 152 | - p2 = spidey.hor.p(1,0); | |
| 153 | - p3 = spidey.hor.p(0,1); | |
| 152 | + p2 = spidey.hor.p(0,1); | |
| 153 | + p3 = spidey.hor.p(1,0); | |
| 154 | 154 | p4 = spidey.hor.p(1,1); |
| 155 | 155 | glPushName(HORIZONTAL); |
| 156 | 156 | glBegin(GL_QUADS); |
| ... | ... | @@ -255,8 +255,8 @@ DrawSpiders() |
| 255 | 255 | glEnd(); |
| 256 | 256 | */ |
| 257 | 257 | p1 = spidey.hor.p(0,0); |
| 258 | - p2 = spidey.hor.p(1,0); | |
| 259 | - p3 = spidey.hor.p(0,1); | |
| 258 | + p2 = spidey.hor.p(0,1); | |
| 259 | + p3 = spidey.hor.p(1,0); | |
| 260 | 260 | p4 = spidey.hor.p(1,1); |
| 261 | 261 | glBegin(GL_QUADS); |
| 262 | 262 | glTexCoord3f( |
| ... | ... | @@ -285,8 +285,8 @@ DrawSpiders() |
| 285 | 285 | glVertex2f(-5.0, -3.0); |
| 286 | 286 | glEnd(); |
| 287 | 287 | p1 = spidey.ver.p(0,0); |
| 288 | - p2 = spidey.ver.p(1,0); | |
| 289 | - p3 = spidey.ver.p(0,1); | |
| 288 | + p2 = spidey.ver.p(0,1); | |
| 289 | + p3 = spidey.ver.p(1,0); | |
| 290 | 290 | p4 = spidey.ver.p(1,1); |
| 291 | 291 | |
| 292 | 292 | glBegin(GL_QUADS); |
| ... | ... | @@ -449,7 +449,6 @@ processKeys(unsigned char key, int x, int y) |
| 449 | 449 | { |
| 450 | 450 | spidey.Step(); |
| 451 | 451 | std::cout << "Took a step" << std::endl; |
| 452 | - glutPostRedisplay(); | |
| 453 | 452 | } |
| 454 | 453 | } |
| 455 | 454 | ... | ... |