named members m_* to quite -Wshadow

[physics.git] / src / Entities / Polygon.cpp

diff --git a/src/Entities/Polygon.cpp b/src/Entities/Polygon.cpp
index cd03d85..9f1aa43 100644 (file)
--- a/src/Entities/Polygon.cpp
+++ b/src/Entities/Polygon.cpp
@@ -16,17 +16,18 @@
  */
 
 #include "Polygon.h"
-#include "debug.h"
 
-#include "Vector2.h"
+#include <bear/debug.h>
+#include <bear/Vector2.h>
+using namespace bear;
 
 #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)), m_points(points), m_color(color)
 {
     DASSERT(0 < points.size());
 
@@ -42,24 +43,24 @@ Polygon::~Polygon()
 
 void Polygon::draw() const
 {
-    graphics::drawPolygon(points);
+    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].x < minP.x) minP.x = points[i].x;
-        else if(points[i].x > maxP.x) maxP.x = points[i].x;
+             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].y < minP.y) minP.y = points[i].y;
-        else if(points[i].y > maxP.y) maxP.y = points[i].y;
+             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;
     }
 }