Trying to switch to more object-oriented

2021-03-12 22:33:46 +01:00
parent fbe122a5b9
commit 258ce51cfe
32 changed files with 693 additions and 249 deletions
@@ -1,11 +1,12 @@
 #include "sdlpp_collision.hpp"

 namespace SDLPP {
-CollisionPolygon::CollisionPolygon( double x, double y ) {
-    original_x = x;
-    original_y = y;
-    position_x = 0;
-    position_y = 0;
+CollisionPolygon::CollisionPolygon( double x, double y )
+        : CollisionPolygon( Vec2D<double>( x, y ) ) {}
+
+CollisionPolygon::CollisionPolygon( const Vec2D< double > &input ) {
+    original = input;
+    position = { 0, 0 };
 }

 bool CollisionPolygon::isInfinite() const {
@@ -16,15 +17,14 @@ void CollisionPolygon::setInfinite() {
 }

 void CollisionPolygon::updateCollision( int x, int y, int w, int h ) {
-    position_x = original_x * w + x;
-    position_y = original_y * h + y;
+    position = Vec2D< int >( original.getX() * w + x, original.getY() * h + y );
 }

 int CollisionPolygon::getX() const {
-    return position_x;
+    return position.getX();
 }
 int CollisionPolygon::getY() const {
-    return position_y;
+    return position.getY();
 }

 void CollisionPolygon::setColor( const std::string &color ) {