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
@@ -2,9 +2,10 @@

 namespace SDLPP {
 CircleColider::CircleColider( double x, double y, double rad )
-        : CollisionPolygon( x, y ) {
-    original_rad = rad;
-}
+        : CircleColider( {x, y}, rad ) {};
+
+CircleColider::CircleColider( const Vec2D< double > &center, double rad )
+        : CollisionPolygon( center ), original_rad( rad ) {}

 bool CircleColider::colidesWith( const SDLPP::CollisionPolygon &other ) const {
    if ( other.isCircle() ) {
@@ -60,8 +61,7 @@ int CircleColider::rightmost() const {
 }

 void CircleColider::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 );
    rad_ = original_rad * w;
 }