Browse Source

debug: fix a timing issue in the quad debug object.

legacy
Sam Hocevar sam 13 years ago
parent
commit
1ca9c191e6
1 changed files with 6 additions and 6 deletions
  1. +6
    -6
      src/debug/quad.cpp

+ 6
- 6
src/debug/quad.cpp View File

@@ -94,11 +94,11 @@ private:
float x = 0.0f; float x = 0.0f;
for (npoints = 0; npoints < SINE_SIZE && x <= 1.0f; npoints++) for (npoints = 0; npoints < SINE_SIZE && x <= 1.0f; npoints++)
{ {
float y = 0.5f + 0.5f * lol_sin(x * 2.0f * M_PI + time * 2e-3f);
float y = 0.5f + 0.5f * lol_sin(x * 2.0f * M_PI + time * 5e-3f);
points[npoints * 2] = aa.x + (bb.x - aa.x) * x; points[npoints * 2] = aa.x + (bb.x - aa.x) * x;
points[npoints * 2 + 1] = aa.y + (bb.y - aa.y) * y; points[npoints * 2 + 1] = aa.y + (bb.y - aa.y) * y;


float dy = M_PI * lol_cos(x * 2.0f * M_PI + time * 2e-3f);
float dy = M_PI * lol_cos(x * 2.0f * M_PI + time * 5e-3f);
float dx = SINE_SPACE / sqrtf(1.0f + dy * dy); float dx = SINE_SPACE / sqrtf(1.0f + dy * dy);
x += dx; x += dx;
} }
@@ -209,7 +209,7 @@ void DebugQuad::TickDraw(float deltams)


GLfloat texcoords[12]; GLfloat texcoords[12];
mat4 t1 = mat4::translate(0.5f, 0.5f, 0.0f) mat4 t1 = mat4::translate(0.5f, 0.5f, 0.0f)
* mat4::rotate(0.00054f * data->time, 0.0f, 0.0f, 1.0f)
* mat4::rotate(0.0254f * data->time, 0.0f, 0.0f, 1.0f)
* mat4::translate(-0.5f, -0.5f, 0.0f); * mat4::translate(-0.5f, -0.5f, 0.0f);
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
@@ -220,9 +220,9 @@ void DebugQuad::TickDraw(float deltams)


GLfloat colors[18]; GLfloat colors[18];
mat4 t2 = mat4::translate(0.5f, 0.5f, 0.5f) mat4 t2 = mat4::translate(0.5f, 0.5f, 0.5f)
* mat4::rotate(0.00034f * data->time, 0.0f, 0.0f, 1.0f)
* mat4::rotate(0.00041f * data->time, 0.0f, 1.0f, 0.0f)
* mat4::rotate(0.00057f * data->time, 1.0f, 0.0f, 0.0f)
* mat4::rotate(0.0154f * data->time, 0.0f, 0.0f, 1.0f)
* mat4::rotate(0.0211f * data->time, 0.0f, 1.0f, 0.0f)
* mat4::rotate(0.0267f * data->time, 1.0f, 0.0f, 0.0f)
* mat4::translate(-0.5f, -0.5f, 0.0f); * mat4::translate(-0.5f, -0.5f, 0.0f);
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {


Loading…
Cancel
Save