fixed merge conflict

5 files changed, 0 insertions, 111 deletions

diff --git a/gameloop/include/eventManager.h b/gameloop/include/eventManager.h
deleted file mode 100644
index 2aa0a68..0000000
--- a/gameloop/include/eventManager.h
+++ /dev/null
@@ -1,4 +0,0 @@
-class EventManager
-{
-
-};
diff --git a/gameloop/include/gameObject.h b/gameloop/include/gameObject.h
deleted file mode 100644
index fc7d026..0000000
--- a/gameloop/include/gameObject.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#pragma once
-#include <iostream>
-class GameObject {
-	public:
-		GameObject();
-		GameObject(std::string name, float x, float y, float width, float height, float velX, float velY);
-		std::string getName() const;
-		float getX() const;
-		float getY() const;
-		float getWidth() const;
-		float getHeight() const;
-		float getVelX() const;
-		float getVelY() const;
-		void setName(std::string value);
-		void setX(float value);
-		void setY(float value);
-		void setWidth(float value);
-		void setHeight(float value);
-		void setVelX(float value);
-		void setVelY(float value);
-		int direction;
-	private:
-		std::string name = "";
-		float x = 0;
-		float y = 0;
-		float width = 0;
-		float height = 0;
-		float velX = 0;
-		float velY = 0;
-};
diff --git a/gameloop/include/loopManager.h b/gameloop/include/loopManager.h
deleted file mode 100644
index 06bcd5f..0000000
--- a/gameloop/include/loopManager.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-#include <SDL2/SDL.h>
-#include "window.h"
-#include "gameObject.h"
-class LoopManager{
-	public:
-		LoopManager();
-		void setup();
-		void loop();
-	private:
-		
-		std::vector<GameObject*> objectList;
-		void processInput();
-		void update();
-		void lateUpdate();
-		void fixedUpdate();
-		void render();
-		bool gameRunning = false;
-		WindowManager window;
-		int timeScale = 1;
-		float accumulator = 0.0;
-		double currentTime;
-		double t = 0.0;
-		double dt = 0.01;
-};
diff --git a/gameloop/include/timer.h b/gameloop/include/timer.h
deleted file mode 100644
index ca1e5f3..0000000
--- a/gameloop/include/timer.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-
-#include <SDL2/SDL.h>
-
-class LoopTimer {
-public:
-    static LoopTimer& getInstance();
-    void start();
-    void update();
-    double getDeltaTime() const;
-    int getCurrentTime() const;
-	void advanceFixedUpdate();
-	double getFixedDeltaTime() const;
-    void setFPS(int FPS);
-    int getFPS() const;
-	double getGameScale();
-	void setGameScale(double);
-    void enforceFrameRate();
-	double getLag() const;
-private:
-    LoopTimer();
-	int FPS = 50;
-	double gameScale = 1;
-	double maximumDeltaTime = 0.25;
-    double deltaTime;
-	double frameTargetTime = FPS / 1000;
-    double fixedDeltaTime = 0.01;
-    double elapsedTime;
-    double elapsedFixedTime;
-	double time;
-    uint64_t lastFrameTime;
-};
diff --git a/gameloop/include/window.h b/gameloop/include/window.h
deleted file mode 100644
index cfde0e9..0000000
--- a/gameloop/include/window.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-#include <SDL2/SDL.h>
-#include <vector>
-#include "gameObject.h"
-#include <iostream>
-class WindowManager{
-	public:
-		WindowManager();
-		virtual ~WindowManager();
-		void render(std::vector<GameObject*> objects);
-		bool initWindow();
-		void destroyWindow();
-		
-		SDL_Renderer* getRenderer();
-	private:
-		const int SCREEN_WIDTH = 800;
-		const int SCREEN_HEIGHT = 600;
-		SDL_Window* window = NULL;
-		SDL_Renderer* renderer = NULL;
-};