From 4c64dbc5c4ac44ef7dfe8a950ee67f96e6f99991 Mon Sep 17 00:00:00 2001 From: JAROWMR Date: Thu, 12 Dec 2024 14:49:58 +0100 Subject: fixed game --- src/example/game.cpp | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) (limited to 'src/example/game.cpp') diff --git a/src/example/game.cpp b/src/example/game.cpp index 4239c15..5c8d749 100644 --- a/src/example/game.cpp +++ b/src/example/game.cpp @@ -2,6 +2,7 @@ #include "api/Scene.h" #include "manager/ComponentManager.h" #include "manager/Mediator.h" +#include "types.h" #include #include #include @@ -11,7 +12,6 @@ #include #include #include -#include #include #include @@ -183,16 +183,16 @@ public: vec2{world_collider, world_collider}); // Left world.add_component(vec2{screen_size_width / 2 + world_collider / 2, 0}, vec2{world_collider, world_collider}); // right - world.add_component( - Color::WHITE, - ivec2{static_cast(screen_size_width), static_cast(screen_size_height)}, - vec2{screen_size_width, screen_size_height}, 1.0f); + world.add_component(ivec2{static_cast(screen_size_width),static_cast(screen_size_height)},vec2{screen_size_width,screen_size_height},Camera::Data{ + .bg_color = Color::WHITE, + .zoom = 1, + }); GameObject game_object1 = mgr.new_object( "Name", "Tag", vec2{screen_size_width / 2, screen_size_height / 2}, 0, 1); game_object1.add_component(Rigidbody::Data{ .mass = 1, - .gravity_scale = 0, + .gravity_scale = 1, .body_type = Rigidbody::BodyType::DYNAMIC, .linear_velocity = {0, 0}, .constraints = {0, 0, 0}, @@ -203,17 +203,19 @@ public: // add box with boxcollider game_object1.add_component(vec2{0, 0}, vec2{20, 20}); game_object1.add_component().set_script(); - auto img1 = Texture("asset/texture/square.png"); - game_object1.add_component(img1, color, Sprite::FlipSettings{false, false}, 1, - 1, 20); + + Asset img1{"asset/texture/square.png"}; + game_object1.add_component(img1,Sprite::Data{ + .size = {20,20}, + }); //add circle with cirlcecollider deactiveated game_object1.add_component(vec2{0, 0}, 10).active = false; - auto img2 = Texture("asset/texture/circle.png"); + Asset img2{"asset/texture/circle.png"}; game_object1 - .add_component(img2, color, Sprite::FlipSettings{false, false}, 1, 1, 20) - .active - = false; + .add_component(img2,Sprite::Data{ + .size = {20,20}, + }).active = false; GameObject game_object2 = mgr.new_object( "Name", "Tag", vec2{screen_size_width / 2, screen_size_height / 2}, 0, 1); @@ -230,17 +232,17 @@ public: // add box with boxcollider game_object2.add_component(vec2{0, 0}, vec2{20, 20}); game_object2.add_component().set_script(); - auto img3 = Texture("asset/texture/square.png"); - game_object2.add_component(img3, color, Sprite::FlipSettings{false, false}, 1, - 1, 20); + + game_object2.add_component(img1,Sprite::Data{ + .size = {20,20}, + }); //add circle with cirlcecollider deactiveated game_object2.add_component(vec2{0, 0}, 10).active = false; - auto img4 = Texture("asset/texture/circle.png"); - game_object2 - .add_component(img4, color, Sprite::FlipSettings{false, false}, 1, 1, 20) - .active - = false; + + game_object2.add_component(img2,Sprite::Data{ + .size = {20,20}, + }).active = false; } string get_name() const { return "scene1"; } -- cgit v1.2.3 From 72ba9f9dd9553c8bbca83f4f73a59d28d1f89273 Mon Sep 17 00:00:00 2001 From: JAROWMR Date: Thu, 12 Dec 2024 14:54:23 +0100 Subject: added rotation for preview --- src/example/game.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/example/game.cpp') diff --git a/src/example/game.cpp b/src/example/game.cpp index 5c8d749..aab8d66 100644 --- a/src/example/game.cpp +++ b/src/example/game.cpp @@ -66,6 +66,11 @@ class MyScript1 : public Script { //add collider switch break; } + case Keycode::Q: { + Rigidbody & rg = this->get_component(); + rg.data.angular_velocity = 1; + break; + } default: break; } -- cgit v1.2.3 From f9ed8f05ec95e530041d54921cdd17023cdfde6f Mon Sep 17 00:00:00 2001 From: JAROWMR Date: Thu, 12 Dec 2024 14:59:59 +0100 Subject: make format --- src/crepe/system/AISystem.cpp | 1 - src/crepe/system/PhysicsSystem.cpp | 33 +++++++++++++-------------- src/example/game.cpp | 46 +++++++++++++++++++++++--------------- src/test/PhysicsTest.cpp | 39 ++++++++++++++++---------------- 4 files changed, 62 insertions(+), 57 deletions(-) (limited to 'src/example/game.cpp') diff --git a/src/crepe/system/AISystem.cpp b/src/crepe/system/AISystem.cpp index a20e28c..6578ecb 100644 --- a/src/crepe/system/AISystem.cpp +++ b/src/crepe/system/AISystem.cpp @@ -44,7 +44,6 @@ void AISystem::update() { vec2 acceleration = force / rigidbody.data.mass; // Finally, update Rigidbody's velocity rigidbody.data.linear_velocity += acceleration * duration(dt).count(); - } } diff --git a/src/crepe/system/PhysicsSystem.cpp b/src/crepe/system/PhysicsSystem.cpp index 78370d1..a1d35bb 100644 --- a/src/crepe/system/PhysicsSystem.cpp +++ b/src/crepe/system/PhysicsSystem.cpp @@ -22,11 +22,12 @@ void PhysicsSystem::update() { duration_t delta_time = loop_timer.get_scaled_fixed_delta_time(); float dt = duration(delta_time).count(); - + float gravity = Config::get_instance().physics.gravity; for (Rigidbody & rigidbody : rigidbodies) { if (!rigidbody.active) continue; - Transform & transform = mgr.get_components_by_id(rigidbody.game_object_id).front().get(); + Transform & transform + = mgr.get_components_by_id(rigidbody.game_object_id).front().get(); switch (rigidbody.data.body_type) { case Rigidbody::BodyType::DYNAMIC: @@ -43,43 +44,39 @@ void PhysicsSystem::update() { if (rigidbody.data.gravity_scale > 0) { rigidbody.data.linear_velocity.y - += (rigidbody.data.mass * rigidbody.data.gravity_scale - * gravity * dt); + += (rigidbody.data.mass * rigidbody.data.gravity_scale * gravity + * dt); } // Add coefficient rotation if (rigidbody.data.angular_velocity_coefficient > 0) { rigidbody.data.angular_velocity *= std::pow(rigidbody.data.angular_velocity_coefficient, dt); - } // Add coefficient movement horizontal - if (rigidbody.data.linear_velocity_coefficient.x > 0) - { + if (rigidbody.data.linear_velocity_coefficient.x > 0) { rigidbody.data.linear_velocity.x - *= std::pow(rigidbody.data.linear_velocity_coefficient.x, dt); + *= std::pow(rigidbody.data.linear_velocity_coefficient.x, dt); } // Add coefficient movement horizontal - if (rigidbody.data.linear_velocity_coefficient.y > 0) - { + if (rigidbody.data.linear_velocity_coefficient.y > 0) { rigidbody.data.linear_velocity.y - *= std::pow(rigidbody.data.linear_velocity_coefficient.y, dt); + *= std::pow(rigidbody.data.linear_velocity_coefficient.y, dt); } // Max velocity check if (rigidbody.data.angular_velocity > rigidbody.data.max_angular_velocity) { - rigidbody.data.angular_velocity - = rigidbody.data.max_angular_velocity; + rigidbody.data.angular_velocity = rigidbody.data.max_angular_velocity; } else if (rigidbody.data.angular_velocity - < -rigidbody.data.max_angular_velocity) { - rigidbody.data.angular_velocity - = -rigidbody.data.max_angular_velocity; + < -rigidbody.data.max_angular_velocity) { + rigidbody.data.angular_velocity = -rigidbody.data.max_angular_velocity; } - + // Set max velocity to maximum length - if(rigidbody.data.linear_velocity.length() > rigidbody.data.max_linear_velocity) { + if (rigidbody.data.linear_velocity.length() + > rigidbody.data.max_linear_velocity) { rigidbody.data.linear_velocity.normalize(); rigidbody.data.linear_velocity *= rigidbody.data.max_linear_velocity; } diff --git a/src/example/game.cpp b/src/example/game.cpp index aab8d66..5361f3a 100644 --- a/src/example/game.cpp +++ b/src/example/game.cpp @@ -188,10 +188,13 @@ public: vec2{world_collider, world_collider}); // Left world.add_component(vec2{screen_size_width / 2 + world_collider / 2, 0}, vec2{world_collider, world_collider}); // right - world.add_component(ivec2{static_cast(screen_size_width),static_cast(screen_size_height)},vec2{screen_size_width,screen_size_height},Camera::Data{ - .bg_color = Color::WHITE, - .zoom = 1, - }); + world.add_component( + ivec2{static_cast(screen_size_width), static_cast(screen_size_height)}, + vec2{screen_size_width, screen_size_height}, + Camera::Data{ + .bg_color = Color::WHITE, + .zoom = 1, + }); GameObject game_object1 = mgr.new_object( "Name", "Tag", vec2{screen_size_width / 2, screen_size_height / 2}, 0, 1); @@ -210,17 +213,20 @@ public: game_object1.add_component().set_script(); Asset img1{"asset/texture/square.png"}; - game_object1.add_component(img1,Sprite::Data{ - .size = {20,20}, - }); + game_object1.add_component(img1, Sprite::Data{ + .size = {20, 20}, + }); //add circle with cirlcecollider deactiveated game_object1.add_component(vec2{0, 0}, 10).active = false; Asset img2{"asset/texture/circle.png"}; game_object1 - .add_component(img2,Sprite::Data{ - .size = {20,20}, - }).active = false; + .add_component(img2, + Sprite::Data{ + .size = {20, 20}, + }) + .active + = false; GameObject game_object2 = mgr.new_object( "Name", "Tag", vec2{screen_size_width / 2, screen_size_height / 2}, 0, 1); @@ -237,17 +243,21 @@ public: // add box with boxcollider game_object2.add_component(vec2{0, 0}, vec2{20, 20}); game_object2.add_component().set_script(); - - game_object2.add_component(img1,Sprite::Data{ - .size = {20,20}, - }); + + game_object2.add_component(img1, Sprite::Data{ + .size = {20, 20}, + }); //add circle with cirlcecollider deactiveated game_object2.add_component(vec2{0, 0}, 10).active = false; - - game_object2.add_component(img2,Sprite::Data{ - .size = {20,20}, - }).active = false; + + game_object2 + .add_component(img2, + Sprite::Data{ + .size = {20, 20}, + }) + .active + = false; } string get_name() const { return "scene1"; } diff --git a/src/test/PhysicsTest.cpp b/src/test/PhysicsTest.cpp index 198a371..c04e3ff 100644 --- a/src/test/PhysicsTest.cpp +++ b/src/test/PhysicsTest.cpp @@ -3,10 +3,10 @@ #include #include #include -#include -#include #include #include +#include +#include using namespace std; using namespace std::chrono_literals; @@ -20,7 +20,6 @@ public: PhysicsSystem system{m}; LoopTimerManager loop_timer{m}; - void SetUp() override { ComponentManager & mgr = this->component_manager; vector> transforms @@ -59,10 +58,10 @@ TEST_F(PhysicsTest, gravity) { EXPECT_EQ(transform.position.y, 0); system.update(); - EXPECT_NEAR(transform.position.y, 0.0004,0.0001); + EXPECT_NEAR(transform.position.y, 0.0004, 0.0001); system.update(); - EXPECT_NEAR(transform.position.y, 0.002,0.001); + EXPECT_NEAR(transform.position.y, 0.002, 0.001); } TEST_F(PhysicsTest, max_velocity) { @@ -76,15 +75,15 @@ TEST_F(PhysicsTest, max_velocity) { rigidbody.add_force_linear({100, 100}); rigidbody.add_force_angular(100); system.update(); - EXPECT_NEAR(rigidbody.data.linear_velocity.y, 7.07,0.01); - EXPECT_NEAR(rigidbody.data.linear_velocity.x, 7.07,0.01); + EXPECT_NEAR(rigidbody.data.linear_velocity.y, 7.07, 0.01); + EXPECT_NEAR(rigidbody.data.linear_velocity.x, 7.07, 0.01); EXPECT_EQ(rigidbody.data.angular_velocity, 10); rigidbody.add_force_linear({-100, -100}); rigidbody.add_force_angular(-100); system.update(); - EXPECT_NEAR(rigidbody.data.linear_velocity.y, -7.07,0.01); - EXPECT_NEAR(rigidbody.data.linear_velocity.x, -7.07,0.01); + EXPECT_NEAR(rigidbody.data.linear_velocity.y, -7.07, 0.01); + EXPECT_NEAR(rigidbody.data.linear_velocity.x, -7.07, 0.01); EXPECT_EQ(rigidbody.data.angular_velocity, -10); } @@ -101,31 +100,31 @@ TEST_F(PhysicsTest, movement) { rigidbody.add_force_linear({1, 1}); rigidbody.add_force_angular(1); system.update(); - EXPECT_NEAR(transform.position.x, 0.02,0.001); - EXPECT_NEAR(transform.position.y, 0.02,0.001); - EXPECT_NEAR(transform.rotation, 0.02,0.001); + EXPECT_NEAR(transform.position.x, 0.02, 0.001); + EXPECT_NEAR(transform.position.y, 0.02, 0.001); + EXPECT_NEAR(transform.rotation, 0.02, 0.001); rigidbody.data.constraints = {1, 1, 1}; - EXPECT_NEAR(transform.position.x, 0.02,0.001); - EXPECT_NEAR(transform.position.y, 0.02,0.001); - EXPECT_NEAR(transform.rotation, 0.02,0.001); + EXPECT_NEAR(transform.position.x, 0.02, 0.001); + EXPECT_NEAR(transform.position.y, 0.02, 0.001); + EXPECT_NEAR(transform.rotation, 0.02, 0.001); rigidbody.data.linear_velocity_coefficient.x = 0.5; rigidbody.data.linear_velocity_coefficient.y = 0.5; rigidbody.data.angular_velocity_coefficient = 0.5; system.update(); - EXPECT_NEAR(rigidbody.data.linear_velocity.x, 0.98,0.01); - EXPECT_NEAR(rigidbody.data.linear_velocity.y, 0.98,0.01); - EXPECT_NEAR(rigidbody.data.angular_velocity, 0.98,0.01); + EXPECT_NEAR(rigidbody.data.linear_velocity.x, 0.98, 0.01); + EXPECT_NEAR(rigidbody.data.linear_velocity.y, 0.98, 0.01); + EXPECT_NEAR(rigidbody.data.angular_velocity, 0.98, 0.01); rigidbody.data.constraints = {1, 1, 0}; rigidbody.data.angular_velocity_coefficient = 0; rigidbody.data.max_angular_velocity = 1000; rigidbody.data.angular_velocity = 360; system.update(); - EXPECT_NEAR(transform.rotation, 7.22,0.0001); + EXPECT_NEAR(transform.rotation, 7.22, 0.0001); rigidbody.data.angular_velocity = -360; system.update(); - EXPECT_NEAR(transform.rotation, 0.02,0.001); + EXPECT_NEAR(transform.rotation, 0.02, 0.001); } -- cgit v1.2.3 From 1bfd582b7b7f762011f5f4b7f84e180cf20e9046 Mon Sep 17 00:00:00 2001 From: JAROWMR Date: Thu, 12 Dec 2024 19:35:19 +0100 Subject: shielded mediator --- src/crepe/api/CMakeLists.txt | 1 + src/crepe/api/Scene.h | 62 ++++++++++++++++++++++++++++++++++++++++++-- src/crepe/api/Scene.hpp | 13 ++++++++++ src/example/game.cpp | 8 +++--- 4 files changed, 77 insertions(+), 7 deletions(-) create mode 100644 src/crepe/api/Scene.hpp (limited to 'src/example/game.cpp') diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt index fb11c8d..eb7b042 100644 --- a/src/crepe/api/CMakeLists.txt +++ b/src/crepe/api/CMakeLists.txt @@ -36,6 +36,7 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES Vector2.hpp Color.h Scene.h + Scene.hpp Metadata.h Camera.h Animator.h diff --git a/src/crepe/api/Scene.h b/src/crepe/api/Scene.h index ba9bb76..a1e5cfe 100644 --- a/src/crepe/api/Scene.h +++ b/src/crepe/api/Scene.h @@ -3,12 +3,16 @@ #include #include "../manager/Mediator.h" +#include "../manager/ResourceManager.h" +#include "../manager/ComponentManager.h" #include "../util/OptionalRef.h" +#include "GameObject.h" namespace crepe { class SceneManager; class ComponentManager; +class Asset; /** * \brief Represents a Scene @@ -38,7 +42,7 @@ public: // TODO: Late references should ALWAYS be private! This is currently kept as-is so unit tests // keep passing, but this reference should not be directly accessible by the user!!! -protected: +private: /** * \name Late references * @@ -51,8 +55,62 @@ protected: * \{ */ //! Mediator reference - OptionalRef mediator; //! \} + OptionalRef mediator; + +protected: + + /** + * \brief Retrieve the reference to the SaveManager instance + * + * \returns A reference to the SaveManager instance held by the Mediator. + */ + SaveManager& get_save_manager() const{ + return mediator->save_manager; + } + + /** + * \brief Create a new game object using the component manager + * + * \param name Metadata::name (required) + * \param tag Metadata::tag (optional, empty by default) + * \param position Transform::position (optional, origin by default) + * \param rotation Transform::rotation (optional, 0 by default) + * \param scale Transform::scale (optional, 1 by default) + * + * \returns GameObject interface + * + * \note This method automatically assigns a new entity ID + */ + GameObject new_object(const std::string & name, const std::string & tag = "", + const vec2 & position = {0, 0}, double rotation = 0, + double scale = 1) { + // Forward the call to ComponentManager's new_object method + return mediator->component_manager->new_object(name, tag, position, rotation, scale); + } + + /** + * \brief Mark a resource as persistent (i.e. used across multiple scenes) + * + * \param asset Asset the concrete resource is instantiated from + * \param persistent Whether this resource is persistent (true=keep, false=destroy) + */ + void set_persistent(const Asset & asset, bool persistent){ + mediator->resource_manager->set_persistent(asset, persistent); + } + + /** + * \brief Log a message using Log::logf + * + * \tparam Args Log::logf parameters + * \param args Log::logf parameters + */ + template + void logf(Args &&... args); + }; } // namespace crepe + + +#include "Scene.hpp" diff --git a/src/crepe/api/Scene.hpp b/src/crepe/api/Scene.hpp new file mode 100644 index 0000000..d0ada65 --- /dev/null +++ b/src/crepe/api/Scene.hpp @@ -0,0 +1,13 @@ +#pragma once + +#include "Scene.h" +#include "../util/Log.h" + +namespace crepe { + +template +void Scene::logf(Args &&... args) { + Log::logf(std::forward(args)...); +} + +} diff --git a/src/example/game.cpp b/src/example/game.cpp index 5361f3a..16fe18f 100644 --- a/src/example/game.cpp +++ b/src/example/game.cpp @@ -160,15 +160,13 @@ public: void load_scene() { - Mediator & m = this->mediator; - ComponentManager & mgr = m.component_manager; Color color(0, 0, 0, 255); float screen_size_width = 320; float screen_size_height = 240; float world_collider = 1000; //define playable world - GameObject world = mgr.new_object( + GameObject world = new_object( "Name", "Tag", vec2{screen_size_width / 2, screen_size_height / 2}, 0, 1); world.add_component(Rigidbody::Data{ .mass = 0, @@ -196,7 +194,7 @@ public: .zoom = 1, }); - GameObject game_object1 = mgr.new_object( + GameObject game_object1 = new_object( "Name", "Tag", vec2{screen_size_width / 2, screen_size_height / 2}, 0, 1); game_object1.add_component(Rigidbody::Data{ .mass = 1, @@ -228,7 +226,7 @@ public: .active = false; - GameObject game_object2 = mgr.new_object( + GameObject game_object2 = new_object( "Name", "Tag", vec2{screen_size_width / 2, screen_size_height / 2}, 0, 1); game_object2.add_component(Rigidbody::Data{ .mass = 1, -- cgit v1.2.3