From 8ee92e6a33bf7c2c4a5529ba05e01b3cc0683cd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustavo=20Tom=C3=A1s?= Date: Wed, 22 Jun 2022 20:22:56 -0300 Subject: [PATCH] finished t1 --- makefile | 4 +--- src/Component.h | 10 ---------- src/Main.cpp | 7 +------ src/Rect.cpp | 9 --------- src/Rect.h | 8 -------- src/Vec2.cpp | 22 ---------------------- src/Vec2.h | 9 --------- 7 files changed, 2 insertions(+), 67 deletions(-) delete mode 100644 src/Component.h delete mode 100644 src/Rect.cpp delete mode 100644 src/Rect.h delete mode 100644 src/Vec2.cpp delete mode 100644 src/Vec2.h diff --git a/makefile b/makefile index b7b7d95..8d826f2 100644 --- a/makefile +++ b/makefile @@ -20,9 +20,7 @@ CPP_SRC=src/Main.cpp \ src/Game.cpp \ src/State.cpp \ src/Sprite.cpp \ - src/Music.cpp \ - src/Vec2.cpp \ - src/Rect.cpp + src/Music.cpp run: $(CC) $(CPP_SRC) $(CC_FLAGS) -o $(TARGET) diff --git a/src/Component.h b/src/Component.h deleted file mode 100644 index 4388559..0000000 --- a/src/Component.h +++ /dev/null @@ -1,10 +0,0 @@ -class Component { - // public: - // Component(GameObject& associated); - // virtual ~Component(); - // void virtual Update(float dt) = 0; - // void virtual Render(float dt) = 0; - // bool virtual Is(const char* type) = 0; - // protected: - // GameObject& associated; -}; \ No newline at end of file diff --git a/src/Main.cpp b/src/Main.cpp index e22a844..f728709 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -1,12 +1,7 @@ #include "Game.h" -// #include "Vec2.h" -// #include "Rect.h" - int main(int argc, char** argv) { Game::GetInstance().Run(); return 0; -} - -// Game::GetInstance().GetRenderer() \ No newline at end of file +} \ No newline at end of file diff --git a/src/Rect.cpp b/src/Rect.cpp deleted file mode 100644 index 03c5a93..0000000 --- a/src/Rect.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include "Rect.h" - -Rect::Rect(float x, float y, float w, float h) -{ - this->x = x; - this->y = y; - this->w = w; - this->h = h; -} \ No newline at end of file diff --git a/src/Rect.h b/src/Rect.h deleted file mode 100644 index fb91569..0000000 --- a/src/Rect.h +++ /dev/null @@ -1,8 +0,0 @@ -class Rect { - public: - Rect(float x = 0, float y = 0, float w = 0, float h = 0); - float x; - float y; - float w; - float h; -}; diff --git a/src/Vec2.cpp b/src/Vec2.cpp deleted file mode 100644 index d3da08b..0000000 --- a/src/Vec2.cpp +++ /dev/null @@ -1,22 +0,0 @@ -#include "Vec2.h" - -Vec2::Vec2(float x, float y) -{ - this->x = x; - this->y = y; -} - -Vec2 Vec2::Sum2(Vec2 v) -{ - return Vec2(x + v.x, y + v.y); -} - -Vec2 Vec2::Sub2(Vec2 v) -{ - return Vec2(x - v.x, y - v.y); -} - -Vec2 Vec2::Mult2(float e) -{ - return Vec2(x * e, y * e); -} \ No newline at end of file diff --git a/src/Vec2.h b/src/Vec2.h deleted file mode 100644 index d0bd5b4..0000000 --- a/src/Vec2.h +++ /dev/null @@ -1,9 +0,0 @@ -class Vec2 { - public: - Vec2(float x = 0, float y = 0); - Vec2 Sum2(Vec2 v); - Vec2 Sub2(Vec2 v); - Vec2 Mult2(float e); - float x; - float y; -};