diff options
author | Loek Le Blansch <loek@pipeframe.xyz> | 2024-09-21 15:35:05 +0200 |
---|---|---|
committer | Loek Le Blansch <loek@pipeframe.xyz> | 2024-09-21 15:35:05 +0200 |
commit | 44affb6635359ef2f619562800165ccfff438ae4 (patch) | |
tree | 4da7fa01953055740f9e668e94c59259d4d7749f /mwe/gameloop/include | |
parent | ca393b6b47618e48c107ad5c021d86700343648e (diff) |
`make format`
Diffstat (limited to 'mwe/gameloop/include')
-rw-r--r-- | mwe/gameloop/include/eventManager.h | 5 | ||||
-rw-r--r-- | mwe/gameloop/include/gameObject.h | 52 | ||||
-rw-r--r-- | mwe/gameloop/include/loopManager.h | 44 | ||||
-rw-r--r-- | mwe/gameloop/include/timer.h | 29 | ||||
-rw-r--r-- | mwe/gameloop/include/window.h | 33 |
5 files changed, 82 insertions, 81 deletions
diff --git a/mwe/gameloop/include/eventManager.h b/mwe/gameloop/include/eventManager.h index 2aa0a68..69c6801 100644 --- a/mwe/gameloop/include/eventManager.h +++ b/mwe/gameloop/include/eventManager.h @@ -1,4 +1 @@ -class EventManager -{ - -}; +class EventManager {}; diff --git a/mwe/gameloop/include/gameObject.h b/mwe/gameloop/include/gameObject.h index 0e17991..69f4d52 100644 --- a/mwe/gameloop/include/gameObject.h +++ b/mwe/gameloop/include/gameObject.h @@ -1,29 +1,31 @@ #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); - 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); + +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/loopManager.h b/mwe/gameloop/include/loopManager.h index 06bcd5f..e202423 100644 --- a/mwe/gameloop/include/loopManager.h +++ b/mwe/gameloop/include/loopManager.h @@ -1,25 +1,25 @@ #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; +#include "window.h" +#include <SDL2/SDL.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/mwe/gameloop/include/timer.h b/mwe/gameloop/include/timer.h index a245e5c..22383b2 100644 --- a/mwe/gameloop/include/timer.h +++ b/mwe/gameloop/include/timer.h @@ -4,27 +4,28 @@ 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 enforceFrameRate(); + void setFPS(int FPS); + int getFPS() const; + 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; }; diff --git a/mwe/gameloop/include/window.h b/mwe/gameloop/include/window.h index cfde0e9..6806a26 100644 --- a/mwe/gameloop/include/window.h +++ b/mwe/gameloop/include/window.h @@ -1,20 +1,21 @@ #pragma once -#include <SDL2/SDL.h> -#include <vector> #include "gameObject.h" +#include <SDL2/SDL.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; +#include <vector> +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; }; |