projects
/
physics.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
renamed libpg to libbear
[physics.git]
/
src
/
graphics
/
graphics.cpp
diff --git
a/src/graphics/graphics.cpp
b/src/graphics/graphics.cpp
index
d89db8a
..
afc4441
100644
(file)
--- a/
src/graphics/graphics.cpp
+++ b/
src/graphics/graphics.cpp
@@
-16,15
+16,16
@@
*/
#include "graphics.h"
*/
#include "graphics.h"
-#include "debug.h"
+
+#include <bear/debug.h>
+#include <bear/mathw.h>
+using namespace bear;
#include <GL/gl.h>
#include <GL/glu.h>
#include <SDL/SDL.h>
#include <cmath>
#include <GL/gl.h>
#include <GL/glu.h>
#include <SDL/SDL.h>
#include <cmath>
-#include "mathw.h"
-
#include <iostream>
using std::cerr;
using std::cout;
#include <iostream>
using std::cerr;
using std::cout;
@@
-57,7
+58,7
@@
void graphics::drawCircle(float radius, const Vector2& pos, const float* color)
{
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
{
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
- glTranslatef(pos.
x, pos.y
, -1);
+ glTranslatef(pos.
m_fX, pos.m_fY
, -1);
glScalef(radius, radius, radius);
if(color != NULL)
glScalef(radius, radius, radius);
if(color != NULL)
@@
-104,7
+105,7
@@
void glDrawPolygon( const std::vector<Vector2>& points )
{
const Vector2& vec = points.at(n);
{
const Vector2& vec = points.at(n);
- glVertex3f(vec.
x, vec.y
, 0);
+ glVertex3f(vec.
m_fX, vec.m_fY
, 0);
}
glEnd();
}
}
glEnd();
}