X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?a=blobdiff_plain;f=src%2FEntities%2FPolygon.cpp;h=9f1aa43aabf04d9fb4e78b9d7526887a76d4c2db;hb=fd1a93a71bc0222dd77f56c145d550cb6f7829bc;hp=9f2eff6feac7229a3b8f10037419061d2389bed0;hpb=f32a9b7c8eab3536ad354f85ee65c41d5b5da006;p=physics.git

diff --git a/src/Entities/Polygon.cpp b/src/Entities/Polygon.cpp
index 9f2eff6..9f1aa43 100644
--- a/src/Entities/Polygon.cpp
+++ b/src/Entities/Polygon.cpp
@@ -17,8 +17,9 @@
 
 #include "Polygon.h"
 
-#include <pg/debug.h>
-#include <pg/Vector2.h>
+#include <bear/debug.h>
+#include <bear/Vector2.h>
+using namespace bear;
 
 #include "graphics/graphics.h"
 
@@ -26,7 +27,7 @@
 /// ***** Constructors/Destructors *****
 
 Polygon::Polygon(const vector<Vector2>& points, const float* color)
-    : PhysicsEntity(Vector2(0,0)), points(points), color(color)
+    : PhysicsEntity(Vector2(0,0)), m_points(points), m_color(color)
 {
     DASSERT(0 < points.size());
 
@@ -42,24 +43,24 @@ Polygon::~Polygon()
 
 void Polygon::draw() const
 {
-    graphics::drawPolygon(points, color);
+    graphics::drawPolygon(m_points, m_color);
 }
 
 /// ***** Private Class Methods *****
 void Polygon::createBindingBox()
 {
-    DASSERT(0 < points.size());
+    DASSERT(0 < m_points.size());
 
-    maxP = points.at(0);
-    minP = points.at(0);
+    m_maxP = m_points.at(0);
+    m_minP = m_points.at(0);
 
-    for(unsigned int i=1; i<points.size(); i++)
+    for(unsigned int i=1; i<m_points.size(); i++)
     {
-             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(m_points[i].m_fX < m_minP.m_fX) m_minP.m_fX = m_points[i].m_fX;
+        else if(m_points[i].m_fX > m_maxP.m_fX) m_maxP.m_fX = m_points[i].m_fX;
 
-             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;
+             if(m_points[i].m_fY < m_minP.m_fY) m_minP.m_fY = m_points[i].m_fY;
+        else if(m_points[i].m_fY > m_maxP.m_fY) m_maxP.m_fY = m_points[i].m_fY;
     }
 }