aboutsummaryrefslogtreecommitdiff
path: root/src/crepe/system
diff options
context:
space:
mode:
Diffstat (limited to 'src/crepe/system')
-rw-r--r--src/crepe/system/RenderSystem.cpp5
-rw-r--r--src/crepe/system/RenderSystem.h10
2 files changed, 8 insertions, 7 deletions
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index bf5dade..11c20f5 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -22,7 +22,7 @@ void RenderSystem::update_camera() {
for (Camera & cam : cameras) {
SDLContext::get_instance().camera(cam);
- this->curr_cam = &cam;
+ this->curr_cam_ref = &cam;
}
}
@@ -35,7 +35,6 @@ bool sorting_comparison(const Sprite & a, const Sprite & b) {
std::vector<std::reference_wrapper<Sprite>>
RenderSystem::sort(std::vector<std::reference_wrapper<Sprite>> & objs) {
- if (objs.empty()) return {};
std::vector<std::reference_wrapper<Sprite>> sorted_objs(objs);
std::sort(sorted_objs.begin(), sorted_objs.end(), sorting_comparison);
@@ -52,7 +51,7 @@ void RenderSystem::render_sprites() {
SDLContext & render = SDLContext::get_instance();
for (const Sprite & sprite : sorted_sprites) {
auto transforms = mgr.get_components_by_id<Transform>(sprite.game_object_id);
- render.draw(sprite, transforms[0], *curr_cam);
+ render.draw(sprite, transforms[0], *this->curr_cam_ref);
}
}
diff --git a/src/crepe/system/RenderSystem.h b/src/crepe/system/RenderSystem.h
index 7661cbd..1176b06 100644
--- a/src/crepe/system/RenderSystem.h
+++ b/src/crepe/system/RenderSystem.h
@@ -1,12 +1,14 @@
#pragma once
-#include "api/Camera.h"
-#include "System.h"
-#include "api/Sprite.h"
#include <functional>
#include <vector>
+#include "api/Sprite.h"
+#include "api/Camera.h"
+
+#include "System.h"
+
namespace crepe {
/**
@@ -54,7 +56,7 @@ private:
private:
//! Pointer to the current active camera for rendering
- Camera * curr_cam = nullptr;
+ Camera * curr_cam_ref = nullptr;
// TODO: needs a better solution
};