X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?a=blobdiff_plain;f=src%2FEntities%2FPolygon.cpp;h=373f805b91866f98a7eebd808173c525182b97ea;hb=b85b89ba9a2cb0373209e8117046fd308faf0202;hp=cd03d853056ff035b4a711eafc60ce094be1f225;hpb=aa2791cf43a9ddd3a288e504db08e11d03439653;p=physics.git

diff --git a/src/Entities/Polygon.cpp b/src/Entities/Polygon.cpp
index cd03d85..373f805 100644
--- a/src/Entities/Polygon.cpp
+++ b/src/Entities/Polygon.cpp
@@ -16,17 +16,18 @@
  */
 
 #include "Polygon.h"
-#include "debug.h"
 
-#include "Vector2.h"
+#include <pg/debug.h>
+#include <pg/Vector2.h>
+using namespace pg;
 
 #include "graphics/graphics.h"
 
 
 /// ***** Constructors/Destructors *****
 
-Polygon::Polygon(const vector<Vector2>& points)
-    : PhysicsEntity(Vector2(0,0)), points(points)
+Polygon::Polygon(const vector<Vector2>& points, const float* color)
+    : PhysicsEntity(Vector2(0,0)), points(points), color(color)
 {
     DASSERT(0 < points.size());
 
@@ -42,7 +43,7 @@ Polygon::~Polygon()
 
 void Polygon::draw() const
 {
-    graphics::drawPolygon(points);
+    graphics::drawPolygon(points, color);
 }
 
 /// ***** Private Class Methods *****
@@ -55,11 +56,11 @@ void Polygon::createBindingBox()
 
     for(unsigned int i=1; i<points.size(); i++)
     {
-             if(points[i].x < minP.x) minP.x = points[i].x;
-        else if(points[i].x > maxP.x) maxP.x = points[i].x;
+             if(points[i].m_fX < minP.m_fX) minP.m_fX = points[i].m_fX;
+        else if(points[i].m_fX > maxP.m_fX) maxP.m_fX = points[i].m_fX;
 
-             if(points[i].y < minP.y) minP.y = points[i].y;
-        else if(points[i].y > maxP.y) maxP.y = points[i].y;
+             if(points[i].m_fY < minP.m_fY) minP.m_fY = points[i].m_fY;
+        else if(points[i].m_fY > maxP.m_fY) maxP.m_fY = points[i].m_fY;
     }
 }