aboutsummaryrefslogtreecommitdiff
path: root/mwe/gameloop
diff options
context:
space:
mode:
authorLoek Le Blansch <loek@pipeframe.xyz>2024-11-15 17:25:12 +0100
committerLoek Le Blansch <loek@pipeframe.xyz>2024-11-15 17:25:12 +0100
commitf51ddfac7b8948a43a40894185238c8a1ceeb5c4 (patch)
tree0142629fd34b2704f2d92a2f4d888ed0d82fc43f /mwe/gameloop
parentbe1e97bc7a494963ab1567492fafcda99e36f683 (diff)
wrap lines at column 95 instead of 80
Diffstat (limited to 'mwe/gameloop')
-rw-r--r--mwe/gameloop/include/gameObject.h4
-rw-r--r--mwe/gameloop/src/gameObject.cpp4
-rw-r--r--mwe/gameloop/src/loopManager.cpp11
-rw-r--r--mwe/gameloop/src/timer.cpp3
-rw-r--r--mwe/gameloop/src/window.cpp5
-rw-r--r--mwe/gameloop/versions/delayBased.cpp3
6 files changed, 13 insertions, 17 deletions
diff --git a/mwe/gameloop/include/gameObject.h b/mwe/gameloop/include/gameObject.h
index abdc9b0..2764215 100644
--- a/mwe/gameloop/include/gameObject.h
+++ b/mwe/gameloop/include/gameObject.h
@@ -3,8 +3,8 @@
class GameObject {
public:
GameObject();
- GameObject(std::string name, float x, float y, float width, float height,
- float velX, float velY);
+ 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;
diff --git a/mwe/gameloop/src/gameObject.cpp b/mwe/gameloop/src/gameObject.cpp
index b33dc78..809e25f 100644
--- a/mwe/gameloop/src/gameObject.cpp
+++ b/mwe/gameloop/src/gameObject.cpp
@@ -24,8 +24,8 @@ void GameObject::setVelX(float value) { velX = value; }
void GameObject::setVelY(float value) { velY = value; }
-GameObject::GameObject(std::string name, float x, float y, float width,
- float height, float velX, float velY)
+GameObject::GameObject(std::string name, float x, float y, float width, float height,
+ float velX, float velY)
: name(name),
x(x),
y(y),
diff --git a/mwe/gameloop/src/loopManager.cpp b/mwe/gameloop/src/loopManager.cpp
index 49d65fb..fb06995 100644
--- a/mwe/gameloop/src/loopManager.cpp
+++ b/mwe/gameloop/src/loopManager.cpp
@@ -18,11 +18,11 @@ void LoopManager::processInput() {
if (event.key.keysym.sym == SDLK_ESCAPE) {
gameRunning = false;
} else if (event.key.keysym.sym == SDLK_i) {
- LoopTimer::getInstance().setGameScale(
- LoopTimer::getInstance().getGameScale() + 0.1);
+ LoopTimer::getInstance().setGameScale(LoopTimer::getInstance().getGameScale()
+ + 0.1);
} else if (event.key.keysym.sym == SDLK_k) {
- LoopTimer::getInstance().setGameScale(
- LoopTimer::getInstance().getGameScale() - 0.1);
+ LoopTimer::getInstance().setGameScale(LoopTimer::getInstance().getGameScale()
+ - 0.1);
}
break;
@@ -57,8 +57,7 @@ void LoopManager::setup() {
LoopTimer::getInstance().setFPS(10);
this->gameRunning = true;
for (int i = 1; i < 3; i++) {
- GameObject * square
- = new GameObject("square2", i * 60, i * 60, 20, 20, 0, 0);
+ GameObject * square = new GameObject("square2", i * 60, i * 60, 20, 20, 0, 0);
objectList.push_back(square);
}
}
diff --git a/mwe/gameloop/src/timer.cpp b/mwe/gameloop/src/timer.cpp
index 97baef6..5ae1564 100644
--- a/mwe/gameloop/src/timer.cpp
+++ b/mwe/gameloop/src/timer.cpp
@@ -45,8 +45,7 @@ void LoopTimer::enforceFrameRate() {
double frameDuration = (currentFrameTime - lastFrameTime) / 1000.0;
if (frameDuration < frameTargetTime) {
- uint32_t delayTime
- = (uint32_t) ((frameTargetTime - frameDuration) * 1000.0);
+ uint32_t delayTime = (uint32_t) ((frameTargetTime - frameDuration) * 1000.0);
SDL_Delay(delayTime);
}
}
diff --git a/mwe/gameloop/src/window.cpp b/mwe/gameloop/src/window.cpp
index dd1d98f..8f802e1 100644
--- a/mwe/gameloop/src/window.cpp
+++ b/mwe/gameloop/src/window.cpp
@@ -36,9 +36,8 @@ bool WindowManager::initWindow() {
fprintf(stderr, "Error inititalising SDL.\n");
return false;
}
- window = SDL_CreateWindow("SDL Tutorial", SDL_WINDOWPOS_UNDEFINED,
- SDL_WINDOWPOS_UNDEFINED, SCREEN_WIDTH,
- SCREEN_HEIGHT, SDL_WINDOW_SHOWN);
+ window = SDL_CreateWindow("SDL Tutorial", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
+ SCREEN_WIDTH, SCREEN_HEIGHT, SDL_WINDOW_SHOWN);
if (!window) {
fprintf(stderr, "Error creating SDL Window. \n");
return false;
diff --git a/mwe/gameloop/versions/delayBased.cpp b/mwe/gameloop/versions/delayBased.cpp
index 253a03a..634de9c 100644
--- a/mwe/gameloop/versions/delayBased.cpp
+++ b/mwe/gameloop/versions/delayBased.cpp
@@ -32,8 +32,7 @@ void LoopManager::setup() {
LoopTimer::getInstance().setFPS(210);
for (int i = 0; i < 2; i++) {
- GameObject * square2
- = new GameObject("square2", i * 40, i * 40, 20, 20, 0, 0);
+ GameObject * square2 = new GameObject("square2", i * 40, i * 40, 20, 20, 0, 0);
objectList.push_back(square2);
}
}