Browse Source

Fix M_PI usage on Win32.

legacy
Sam Hocevar sam 14 years ago
parent
commit
5a84826e10
1 changed files with 6 additions and 5 deletions
  1. +6
    -5
      src/debugsphere.cpp

+ 6
- 5
src/debugsphere.cpp View File

@@ -7,10 +7,8 @@
# include "config.h" # include "config.h"
#endif #endif


#include <cstdio>
#include <cmath>

#ifdef WIN32 #ifdef WIN32
# define _USE_MATH_DEFINES /* for M_PI */
# define WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN
# include <windows.h> # include <windows.h>
#endif #endif
@@ -21,6 +19,9 @@
# include <GL/gl.h> # include <GL/gl.h>
#endif #endif


#include <cstdio>
#include <cmath>

#include "core.h" #include "core.h"
#include "debugsphere.h" #include "debugsphere.h"


@@ -128,9 +129,9 @@ void DebugSphere::TickDraw(float deltams)


glPushAttrib(GL_COLOR_BUFFER_BIT | GL_CURRENT_BIT); glPushAttrib(GL_COLOR_BUFFER_BIT | GL_CURRENT_BIT);
glBindTexture(GL_TEXTURE_2D, NULL); glBindTexture(GL_TEXTURE_2D, NULL);
glColor4f(1.0f, b, a, 0.2f);
glColor4f(1.0f, b, a, 0.1f);
glTranslatef(320.0f, 240.0f, 32.0f); glTranslatef(320.0f, 240.0f, 32.0f);
for (float t = 0.01f; t < 1.0f; t *= 1.3f)
for (float t = 0.01f; t < 1.0f; t *= 1.1f)
data->DrawSphere(2, t * (60.0f + 40.0f * a)); data->DrawSphere(2, t * (60.0f + 40.0f * a));
glTranslatef(-320.0f, -240.0f, -32.0f); glTranslatef(-320.0f, -240.0f, -32.0f);
glPopAttrib(); glPopAttrib();


Loading…
Cancel
Save