X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?a=blobdiff_plain;f=src%2Fgraphics%2Fgraphics.cpp;h=afc4441b31dee027ed957b189d1a6a485b403382;hb=5e0713e5967be038b1b0cc5f0ffbd0180e3f7099;hp=1130efbee67057f7e22e5ec2d67fdf8a3632dc59;hpb=e68f847b245153427266841ae724d602ca434c29;p=physics.git

diff --git a/src/graphics/graphics.cpp b/src/graphics/graphics.cpp
index 1130efb..afc4441 100644
--- a/src/graphics/graphics.cpp
+++ b/src/graphics/graphics.cpp
@@ -16,19 +16,26 @@
  */
 
 #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 "../mathw.h"
+#include <iostream>
+using std::cerr;
+using std::cout;
+using std::endl;
 
 
 /// ***** Private Method Headers *****
 
 void glDrawCircle(int);
+void glDrawPolygon( const std::vector<Vector2>& points );
 void sdlInit();
 void glInit();
 
@@ -47,11 +54,11 @@ void graphics::clean()
 
 /// ***** Public Methods *****
 
-void graphics::drawCircle(float radius, const Vector2& vec, const float* color)
+void graphics::drawCircle(float radius, const Vector2& pos, const float* color)
 {
     glMatrixMode(GL_MODELVIEW);
     glLoadIdentity();
-    glTranslatef(vec.x, vec.y, -1);
+    glTranslatef(pos.m_fX, pos.m_fY, -1);
     glScalef(radius, radius, radius);
 
     if(color != NULL)
@@ -60,6 +67,21 @@ void graphics::drawCircle(float radius, const Vector2& vec, const float* color)
     glDrawCircle(32);
 }
 
+void graphics::drawPolygon
+(
+  const std::vector<Vector2>& points,
+  const float* color
+)
+{
+    glMatrixMode(GL_MODELVIEW);
+    glLoadIdentity();
+
+    if(color != NULL)
+        glColor3fv(color);
+
+    glDrawPolygon(points);
+}
+
 /// ***** Private Methods *****
 
 void glDrawCircle(int pieces)
@@ -76,6 +98,18 @@ void glDrawCircle(int pieces)
     glEnd();
 }
 
+void glDrawPolygon( const std::vector<Vector2>& points )
+{
+    glBegin(GL_POLYGON);
+        for(unsigned int n = 0; n < points.size(); n++)
+        {
+            const Vector2& vec = points.at(n);
+
+            glVertex3f(vec.m_fX, vec.m_fY, 0);
+        }
+    glEnd();
+}
+
 void sdlInit()
 {
     if(SDL_Init(SDL_INIT_VIDEO) < 0)
@@ -109,4 +143,14 @@ void glInit()
     glLoadIdentity();
 
     glEnable(GL_DEPTH_TEST);
+
+    // anti aliasing?
+    /*
+    glEnable(GL_BLEND);
+    glEnable(GL_POLYGON_SMOOTH_HINT);
+
+    glBlendFunc(GL_SRC_ALPHA_SATURATE, GL_ONE);
+
+    glHint(GL_POLYGON_SMOOTH_HINT, GL_DONT_CARE);
+    */
 }