merge with master

2 files changed, 43 insertions, 40 deletions

diff --git a/mwe/gameloop/include/gameObject.h b/mwe/gameloop/include/gameObject.h
index fc7d026..abdc9b0 100644
--- a/mwe/gameloop/include/gameObject.h
+++ b/mwe/gameloop/include/gameObject.h
@@ -1,30 +1,32 @@
 #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;
+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/mwe/gameloop/include/timer.h b/mwe/gameloop/include/timer.h
index ca1e5f3..8273746 100644
--- a/mwe/gameloop/include/timer.h
+++ b/mwe/gameloop/include/timer.h
@@ -4,29 +4,30 @@
 
 class LoopTimer {
 public:
-    static LoopTimer& getInstance();
-    void start();
-    void update();
-    double getDeltaTime() const;
-    int getCurrentTime() const;
+	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;
+	void setFPS(int FPS);
+	int getFPS() const;
 	double getGameScale();
 	void setGameScale(double);
-    void enforceFrameRate();
+	void enforceFrameRate();
 	double getLag() const;
+
 private:
-    LoopTimer();
+	LoopTimer();
 	int FPS = 50;
 	double gameScale = 1;
 	double maximumDeltaTime = 0.25;
-    double deltaTime;
+	double deltaTime;
 	double frameTargetTime = FPS / 1000;
-    double fixedDeltaTime = 0.01;
-    double elapsedTime;
-    double elapsedFixedTime;
+	double fixedDeltaTime = 0.01;
+	double elapsedTime;
+	double elapsedFixedTime;
 	double time;
-    uint64_t lastFrameTime;
+	uint64_t lastFrameTime;
 };