aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJAROWMR <jarorutjes07@gmail.com>2024-11-23 19:52:15 +0100
committerJAROWMR <jarorutjes07@gmail.com>2024-11-23 19:52:15 +0100
commitcec167477de8afcb53c2f0b18c3453e1599eb980 (patch)
tree446c1a22e85cf950de30cc7d80ae2f30bce07b10
parent444ec7306c8ef43d36f7c6d6e767571b30d10484 (diff)
Fixing PR
-rw-r--r--src/crepe/api/BehaviorScript.hpp1
-rw-r--r--src/crepe/api/Config.h2
-rw-r--r--src/crepe/system/RenderSystem.cpp2
-rw-r--r--src/test/main.cpp2
4 files changed, 3 insertions, 4 deletions
diff --git a/src/crepe/api/BehaviorScript.hpp b/src/crepe/api/BehaviorScript.hpp
index 484c318..2e2def3 100644
--- a/src/crepe/api/BehaviorScript.hpp
+++ b/src/crepe/api/BehaviorScript.hpp
@@ -14,6 +14,7 @@ BehaviorScript & BehaviorScript::set_script(Args &&... args) {
dbg_trace();
static_assert(std::is_base_of<Script, T>::value);
Script * s = new T(std::forward<Args>(args)...);
+
s->game_object_id = this->game_object_id;
s->active = this->active;
s->component_manager = this->component_manager;
diff --git a/src/crepe/api/Config.h b/src/crepe/api/Config.h
index b6c2ccf..13eabd1 100644
--- a/src/crepe/api/Config.h
+++ b/src/crepe/api/Config.h
@@ -33,7 +33,7 @@ public:
*
* Only messages with equal or higher priority than this value will be logged.
*/
- Log::Level level = Log::Level::DEBUG;
+ Log::Level level = Log::Level::INFO;
/**
* \brief Colored log output
*
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index 8f9467e..ad510f5 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -28,8 +28,6 @@ void RenderSystem::update_camera() {
if (cameras.size() == 0) throw std::runtime_error("No cameras in current scene");
- if (cameras.size() == 0) throw std::runtime_error("No cameras in current scene");
-
for (Camera & cam : cameras) {
if (!cam.active) continue;
this->context.set_camera(cam);
diff --git a/src/test/main.cpp b/src/test/main.cpp
index f792239..241015d 100644
--- a/src/test/main.cpp
+++ b/src/test/main.cpp
@@ -9,7 +9,7 @@ int main(int argc, char ** argv) {
InitGoogleTest(&argc, argv);
auto & cfg = Config::get_instance();
- cfg.log.level = Log::Level::INFO;
+ cfg.log.level = Log::Level::ERROR;
return RUN_ALL_TESTS();
}