aboutsummaryrefslogtreecommitdiff
path: root/src/crepe
diff options
context:
space:
mode:
Diffstat (limited to 'src/crepe')
-rw-r--r--src/crepe/api/Animator.cpp3
-rw-r--r--src/crepe/api/Texture.cpp16
-rw-r--r--src/crepe/api/Texture.h10
-rw-r--r--src/crepe/facade/SDLContext.h9
-rw-r--r--src/crepe/system/RenderSystem.cpp2
-rw-r--r--src/crepe/system/RenderSystem.h2
6 files changed, 18 insertions, 24 deletions
diff --git a/src/crepe/api/Animator.cpp b/src/crepe/api/Animator.cpp
index 31b9632..2b21c6c 100644
--- a/src/crepe/api/Animator.cpp
+++ b/src/crepe/api/Animator.cpp
@@ -21,6 +21,7 @@ Animator::Animator(game_object_id_t id, Sprite & ss, int row, int col, int col_a
this->active = false;
// need to do this for to get the aspect ratio for a single clipping in the spritesheet
- this->spritesheet.aspect_ratio = static_cast<double>(this->spritesheet.sprite_rect.w) / this->spritesheet.sprite_rect.h;
+ this->spritesheet.aspect_ratio = static_cast<double>(this->spritesheet.sprite_rect.w)
+ / this->spritesheet.sprite_rect.h;
}
Animator::~Animator() { dbg_trace(); }
diff --git a/src/crepe/api/Texture.cpp b/src/crepe/api/Texture.cpp
index 576bdc3..e43bdaa 100644
--- a/src/crepe/api/Texture.cpp
+++ b/src/crepe/api/Texture.cpp
@@ -17,15 +17,13 @@ Texture::~Texture() {
this->texture.reset();
}
-Texture::Texture(Texture&& other) noexcept
- : texture(std::move(other.texture)){
-}
-
-Texture& Texture::operator=(Texture&& other) noexcept {
- if (this != &other) {
- texture = std::move(other.texture);
- }
- return *this;
+Texture::Texture(Texture && other) noexcept : texture(std::move(other.texture)) {}
+
+Texture & Texture::operator=(Texture && other) noexcept {
+ if (this != &other) {
+ texture = std::move(other.texture);
+ }
+ return *this;
}
void Texture::load(const Asset & res) {
diff --git a/src/crepe/api/Texture.h b/src/crepe/api/Texture.h
index dc4a6d7..7206a66 100644
--- a/src/crepe/api/Texture.h
+++ b/src/crepe/api/Texture.h
@@ -35,11 +35,11 @@ public:
*/
~Texture();
// FIXME: this constructor shouldn't be necessary because this class doesn't manage memory
-
- Texture(Texture&& other) noexcept;
- Texture& operator=(Texture&& other) noexcept;
- Texture(const Texture&) = delete;
- Texture& operator=(const Texture&) = delete;
+
+ Texture(Texture && other) noexcept;
+ Texture & operator=(Texture && other) noexcept;
+ Texture(const Texture &) = delete;
+ Texture & operator=(const Texture &) = delete;
/**
* \brief Gets the width of the texture.
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index 25f2818..5f141be 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -16,14 +16,13 @@
namespace crepe {
-struct RenderCtx{
+struct RenderCtx {
const Sprite & sprite;
const Camera & cam;
const vec2 & cam_pos;
const vec2 & pos;
const double & angle;
const double & scale;
-
};
// TODO: SDL_Keycode is defined in a header not distributed with crepe, which means this
@@ -39,8 +38,6 @@ typedef SDL_Keycode CREPE_KEYCODES;
*/
class SDLContext {
-
-
public:
/**
* \brief Gets the singleton instance of SDLContext.
@@ -161,8 +158,8 @@ private:
* \param img_scale the image multiplier for increasing img size
* \return sdl rectangle to draw a dst image to draw on the screen
*/
- SDL_Rect get_dst_rect(const Sprite & sprite, const vec2 & pos, const Camera & cam, const vec2 & cam_pos,
- const double & img_scale) const;
+ SDL_Rect get_dst_rect(const Sprite & sprite, const vec2 & pos, const Camera & cam,
+ const vec2 & cam_pos, const double & img_scale) const;
private:
//! sdl Window
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index 0bef69b..8895f02 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -6,10 +6,10 @@
#include <vector>
#include "../ComponentManager.h"
+#include "../api/Camera.h"
#include "../api/ParticleEmitter.h"
#include "../api/Sprite.h"
#include "../api/Transform.h"
-#include "../api/Camera.h"
#include "../facade/SDLContext.h"
#include "RenderSystem.h"
diff --git a/src/crepe/system/RenderSystem.h b/src/crepe/system/RenderSystem.h
index 7279b5c..e70831e 100644
--- a/src/crepe/system/RenderSystem.h
+++ b/src/crepe/system/RenderSystem.h
@@ -13,7 +13,6 @@ class Camera;
class Sprite;
class Transform;
-
/**
* \class RenderSystem
* \brief Manages rendering operations for all game objects.
@@ -80,7 +79,6 @@ private:
//! camera postion in the current scene
vec2 cam_pos;
-
};
} // namespace crepe