From e5b57f6a0aadf4f5ca597e4ffa3e557eec87b54b Mon Sep 17 00:00:00 2001 From: heavydemon21 Date: Fri, 20 Dec 2024 15:26:51 +0100 Subject: add world space to text rendering and removedlayers on text --- src/crepe/api/Text.h | 6 ------ src/crepe/facade/SDLContext.cpp | 16 +++++++++++----- src/example/rendering_particle.cpp | 24 +++++++++++++++--------- 3 files changed, 26 insertions(+), 20 deletions(-) diff --git a/src/crepe/api/Text.h b/src/crepe/api/Text.h index da40141..fb5c7e5 100644 --- a/src/crepe/api/Text.h +++ b/src/crepe/api/Text.h @@ -28,12 +28,6 @@ public: */ unsigned int font_size = 16; - //! Layer sorting level of the text - const int sorting_in_layer = 0; - - //! Order within the sorting text - const int order_in_layer = 0; - //! Label text color. Color text_color = Color::BLACK; }; diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp index 64c1fe2..9c45089 100644 --- a/src/crepe/facade/SDLContext.cpp +++ b/src/crepe/facade/SDLContext.cpp @@ -68,7 +68,7 @@ SDLContext::SDLContext(Mediator & mediator) { throw runtime_error(format("SDL_ttf initialization failed: {}", TTF_GetError())); } - SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "1"); + SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "2"); mediator.sdl_context = *this; } @@ -232,10 +232,16 @@ void SDLContext::draw_text(const RenderText & data) { = {tmp_font_texture, [](SDL_Texture * texture) { SDL_DestroyTexture(texture); }}; vec2 size = text.dimensions * cam_aux_data.render_scale * data.transform.scale; - vec2 screen_pos - = (absoluut_pos - cam_aux_data.cam_pos + (cam_aux_data.zoomed_viewport) / 2) - * cam_aux_data.render_scale - - size / 2 + cam_aux_data.bar_size; + vec2 screen_pos = absoluut_pos; + if (text.world_space) { + screen_pos = (screen_pos - cam_aux_data.cam_pos + (cam_aux_data.zoomed_viewport) / 2) + * cam_aux_data.render_scale + - size / 2 + cam_aux_data.bar_size; + } else { + screen_pos + = (screen_pos + (cam_aux_data.zoomed_viewport) / 2) * cam_aux_data.render_scale + - size / 2 + cam_aux_data.bar_size; + } SDL_FRect dstrect{ .x = screen_pos.x, diff --git a/src/example/rendering_particle.cpp b/src/example/rendering_particle.cpp index 5440fdd..0a2f946 100644 --- a/src/example/rendering_particle.cpp +++ b/src/example/rendering_particle.cpp @@ -7,8 +7,8 @@ #include #include #include +#include #include -#include #include #include #include @@ -27,6 +27,7 @@ public: Color color(255, 255, 255, 255); + /* Asset img{"asset/texture/square.png"}; Sprite & test_sprite = game_object.add_component( @@ -49,6 +50,7 @@ public: .position_offset = {0, -1}, .world_space = false, }); + */ auto & cam = game_object.add_component(ivec2{1280, 720}, vec2{5, 5}, Camera::Data{ @@ -56,21 +58,25 @@ public: .postion_offset = {1000, 1000}, }); - /* - game_object.add_component(vec2{1, 1}, vec2{0, -0.5}, "ComicSansMS", - Text::Data{.text_color = Color::RED}, "test TEST"); + game_object.add_component(vec2{1, 1}, vec2{0, -1}, "ComicSansMS", + Text::Data{ + .text_color = Color::RED, + }, + "test TEST"); - game_object.add_component(vec2{1, 1}, vec2{0, 0.5}, "ComicSansMS", - Text::Data{.text_color = Color::BLACK}, "TEST test"); - */ + game_object.add_component(vec2{1, 1}, vec2{0, 1}, "Ariel", + Text::Data{ + .text_color = Color::BLACK, + }, + "TEST test").world_space = true; } string get_name() const { return "TestScene"; }; }; int main(int argc, char * argv[]) { - LoopManager engine; + Engine engine; engine.add_scene(); - engine.start(); + engine.main(); return 0; } -- cgit v1.2.3 From fd09501a1f010126bda5816f17e6e21e204e79cb Mon Sep 17 00:00:00 2001 From: heavydemon21 Date: Fri, 20 Dec 2024 15:27:15 +0100 Subject: make format --- src/example/rendering_particle.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/example/rendering_particle.cpp b/src/example/rendering_particle.cpp index 0a2f946..c8db499 100644 --- a/src/example/rendering_particle.cpp +++ b/src/example/rendering_particle.cpp @@ -64,11 +64,14 @@ public: }, "test TEST"); - game_object.add_component(vec2{1, 1}, vec2{0, 1}, "Ariel", - Text::Data{ - .text_color = Color::BLACK, - }, - "TEST test").world_space = true; + game_object + .add_component(vec2{1, 1}, vec2{0, 1}, "Ariel", + Text::Data{ + .text_color = Color::BLACK, + }, + "TEST test") + .world_space + = true; } string get_name() const { return "TestScene"; }; -- cgit v1.2.3 From 631975d4a03642271f80baeb4494dd01bda9c76e Mon Sep 17 00:00:00 2001 From: heavydemon21 Date: Fri, 20 Dec 2024 15:32:19 +0100 Subject: moved sdl hint to draw sprites and added another to text with 0 instead of 2 beacause otherwise its blurry --- src/crepe/facade/SDLContext.cpp | 3 ++- src/example/rendering_particle.cpp | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp index 9c45089..672d55a 100644 --- a/src/crepe/facade/SDLContext.cpp +++ b/src/crepe/facade/SDLContext.cpp @@ -68,7 +68,6 @@ SDLContext::SDLContext(Mediator & mediator) { throw runtime_error(format("SDL_ttf initialization failed: {}", TTF_GetError())); } - SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "2"); mediator.sdl_context = *this; } @@ -173,6 +172,7 @@ SDL_FRect SDLContext::get_dst_rect(const DestinationRectangleData & ctx) const { } void SDLContext::draw(const RenderContext & ctx) { + SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "2"); const Sprite::Data & data = ctx.sprite.data; SDL_RendererFlip render_flip = (SDL_RendererFlip) ((SDL_FLIP_HORIZONTAL * data.flip.flip_x) @@ -203,6 +203,7 @@ void SDLContext::draw(const RenderContext & ctx) { } void SDLContext::draw_text(const RenderText & data) { + SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "0"); const Text & text = data.text; const Font & font = data.font; diff --git a/src/example/rendering_particle.cpp b/src/example/rendering_particle.cpp index c8db499..5eae00d 100644 --- a/src/example/rendering_particle.cpp +++ b/src/example/rendering_particle.cpp @@ -27,7 +27,6 @@ public: Color color(255, 255, 255, 255); - /* Asset img{"asset/texture/square.png"}; Sprite & test_sprite = game_object.add_component( @@ -50,7 +49,6 @@ public: .position_offset = {0, -1}, .world_space = false, }); - */ auto & cam = game_object.add_component(ivec2{1280, 720}, vec2{5, 5}, Camera::Data{ -- cgit v1.2.3 From 0ba3392d8d5ef1f69bda831c8e2be2efa505b632 Mon Sep 17 00:00:00 2001 From: heavydemon21 Date: Fri, 20 Dec 2024 15:32:38 +0100 Subject: make format --- src/crepe/facade/SDLContext.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp index 672d55a..8e2e8a2 100644 --- a/src/crepe/facade/SDLContext.cpp +++ b/src/crepe/facade/SDLContext.cpp @@ -68,7 +68,6 @@ SDLContext::SDLContext(Mediator & mediator) { throw runtime_error(format("SDL_ttf initialization failed: {}", TTF_GetError())); } - mediator.sdl_context = *this; } -- cgit v1.2.3 From 296c80edd6727d6808ed0c98c001a8b456f1c037 Mon Sep 17 00:00:00 2001 From: heavydemon21 Date: Sat, 21 Dec 2024 10:27:16 +0100 Subject: implemented feedback --- src/crepe/api/Button.h | 6 +++--- src/crepe/api/Text.h | 12 ++---------- src/crepe/api/UIObject.h | 2 -- src/crepe/facade/SDLContext.cpp | 2 +- 4 files changed, 6 insertions(+), 16 deletions(-) diff --git a/src/crepe/api/Button.h b/src/crepe/api/Button.h index d42527e..25709a4 100644 --- a/src/crepe/api/Button.h +++ b/src/crepe/api/Button.h @@ -1,8 +1,5 @@ #pragma once -#include - -#include "Event.h" #include "UIObject.h" namespace crepe { @@ -43,6 +40,9 @@ private: friend class InputSystem; //! Indicates whether the mouse is currently hovering over the button bool hover = false; + + //! variable indicating if transform is relative to camera(false) or world(true) + bool world_space = false; }; } // namespace crepe diff --git a/src/crepe/api/Text.h b/src/crepe/api/Text.h index fb5c7e5..9d8573f 100644 --- a/src/crepe/api/Text.h +++ b/src/crepe/api/Text.h @@ -17,16 +17,8 @@ class Text : public UIObject { public: //! Text data that does not have to be set in the constructor struct Data { - /** - * \brief fontsize for text rendering - * - * \note this is not the actual font size that is loaded in. - * - * Since SDL_TTF requires the font size when loading in the font it is not possible to switch the font size. - * The default font size that is loaded is set in the Config. - * Instead this value is used to upscale the font texture which can cause blurring or distorted text when upscaling or downscaling too much. - */ - unsigned int font_size = 16; + //! variable indicating if transform is relative to camera(false) or world(true) + bool world_space = false; //! Label text color. Color text_color = Color::BLACK; diff --git a/src/crepe/api/UIObject.h b/src/crepe/api/UIObject.h index f1318ab..f7f4fba 100644 --- a/src/crepe/api/UIObject.h +++ b/src/crepe/api/UIObject.h @@ -20,8 +20,6 @@ public: vec2 dimensions; //! Position offset relative to this GameObjects Transform vec2 offset; - //! variable indicating if transform is relative to camera(false) or world(true) - bool world_space = false; }; } // namespace crepe diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp index 8e2e8a2..17dcd04 100644 --- a/src/crepe/facade/SDLContext.cpp +++ b/src/crepe/facade/SDLContext.cpp @@ -233,7 +233,7 @@ void SDLContext::draw_text(const RenderText & data) { vec2 size = text.dimensions * cam_aux_data.render_scale * data.transform.scale; vec2 screen_pos = absoluut_pos; - if (text.world_space) { + if (text.data.world_space) { screen_pos = (screen_pos - cam_aux_data.cam_pos + (cam_aux_data.zoomed_viewport) / 2) * cam_aux_data.render_scale - size / 2 + cam_aux_data.bar_size; -- cgit v1.2.3 From 15220fd01798d88a3c1acd21b6b1220c1273c1ee Mon Sep 17 00:00:00 2001 From: heavydemon21 Date: Sun, 22 Dec 2024 13:52:14 +0100 Subject: button feedback --- src/crepe/api/Button.cpp | 7 +++++-- src/crepe/api/Button.h | 14 +++++++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/crepe/api/Button.cpp b/src/crepe/api/Button.cpp index 40153c9..c4f7f2d 100644 --- a/src/crepe/api/Button.cpp +++ b/src/crepe/api/Button.cpp @@ -2,7 +2,10 @@ namespace crepe { -Button::Button(game_object_id_t id, const vec2 & dimensions, const vec2 & offset) - : UIObject(id, dimensions, offset) {} +Button::Button( + game_object_id_t id, const vec2 & dimensions, const vec2 & offset, const Data & data +) + : UIObject(id, dimensions, offset), + data(data) {} } // namespace crepe diff --git a/src/crepe/api/Button.h b/src/crepe/api/Button.h index 25709a4..f6d363a 100644 --- a/src/crepe/api/Button.h +++ b/src/crepe/api/Button.h @@ -17,6 +17,12 @@ namespace crepe { * */ class Button : public UIObject { +public: + struct Data { + //! variable indicating if transform is relative to camera(false) or world(true) + bool world_space = false; + }; + public: /** * \brief Constructs a Button with the specified game object ID and dimensions. @@ -24,8 +30,11 @@ public: * \param id The unique ID of the game object associated with this button. * \param dimensions The width and height of the UIObject * \param offset The offset relative this GameObjects Transform + * \param data additional data the button has */ - Button(game_object_id_t id, const vec2 & dimensions, const vec2 & offset); + Button( + game_object_id_t id, const vec2 & dimensions, const vec2 & offset, const Data & data + ); /** * \brief Get the maximum number of instances for this component * @@ -41,8 +50,7 @@ private: //! Indicates whether the mouse is currently hovering over the button bool hover = false; - //! variable indicating if transform is relative to camera(false) or world(true) - bool world_space = false; + Data data; }; } // namespace crepe -- cgit v1.2.3 From 2882e217aa5354a6befdddaa2de886f66ff40879 Mon Sep 17 00:00:00 2001 From: heavydemon21 Date: Sun, 22 Dec 2024 13:55:57 +0100 Subject: fixed some includes --- src/crepe/system/InputSystem.cpp | 4 ++-- src/crepe/system/InputSystem.h | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/crepe/system/InputSystem.cpp b/src/crepe/system/InputSystem.cpp index b4a0633..a366d34 100644 --- a/src/crepe/system/InputSystem.cpp +++ b/src/crepe/system/InputSystem.cpp @@ -2,7 +2,7 @@ #include "../facade/SDLContext.h" #include "../manager/ComponentManager.h" #include "../manager/EventManager.h" -#include "util/Log.h" +#include "../api/Config.h" #include "InputSystem.h" @@ -213,7 +213,7 @@ bool InputSystem::is_mouse_inside_button( const Transform & cam_transform ) { vec2 actual_pos = transform.position + button.offset; - if (!button.world_space) { + if (!button.data.world_space) { actual_pos += cam_transform.position; } vec2 half_dimensions = button.dimensions / 2; diff --git a/src/crepe/system/InputSystem.h b/src/crepe/system/InputSystem.h index 37311cc..21a3dfb 100644 --- a/src/crepe/system/InputSystem.h +++ b/src/crepe/system/InputSystem.h @@ -1,12 +1,9 @@ #pragma once -#include "../api/Config.h" #include "../facade/EventData.h" - #include "../api/Event.h" #include "../api/Metadata.h" #include "../types.h" -#include "../util/OptionalRef.h" #include "System.h" -- cgit v1.2.3 From 76f6c4d3e36b653aec79438ae4053ea24560236c Mon Sep 17 00:00:00 2001 From: heavydemon21 Date: Sun, 22 Dec 2024 13:56:17 +0100 Subject: make format --- src/crepe/system/InputSystem.cpp | 2 +- src/crepe/system/InputSystem.h | 2 +- src/example/rendering_particle.cpp | 24 ++++++++++++++---------- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/crepe/system/InputSystem.cpp b/src/crepe/system/InputSystem.cpp index a366d34..91c9c64 100644 --- a/src/crepe/system/InputSystem.cpp +++ b/src/crepe/system/InputSystem.cpp @@ -1,8 +1,8 @@ #include "../api/Button.h" +#include "../api/Config.h" #include "../facade/SDLContext.h" #include "../manager/ComponentManager.h" #include "../manager/EventManager.h" -#include "../api/Config.h" #include "InputSystem.h" diff --git a/src/crepe/system/InputSystem.h b/src/crepe/system/InputSystem.h index 21a3dfb..be62367 100644 --- a/src/crepe/system/InputSystem.h +++ b/src/crepe/system/InputSystem.h @@ -1,8 +1,8 @@ #pragma once -#include "../facade/EventData.h" #include "../api/Event.h" #include "../api/Metadata.h" +#include "../facade/EventData.h" #include "../types.h" #include "System.h" diff --git a/src/example/rendering_particle.cpp b/src/example/rendering_particle.cpp index 9093fd5..8be781a 100644 --- a/src/example/rendering_particle.cpp +++ b/src/example/rendering_particle.cpp @@ -62,18 +62,22 @@ public: } ); - game_object.add_component(vec2{1, 1}, vec2{0, -1}, "ComicSansMS", - Text::Data{ - .text_color = Color::RED, - }, - "test TEST"); + game_object.add_component( + vec2 {1, 1}, vec2 {0, -1}, "ComicSansMS", + Text::Data { + .text_color = Color::RED, + }, + "test TEST" + ); game_object - .add_component(vec2{1, 1}, vec2{0, 1}, "Ariel", - Text::Data{ - .text_color = Color::BLACK, - }, - "TEST test") + .add_component( + vec2 {1, 1}, vec2 {0, 1}, "Ariel", + Text::Data { + .text_color = Color::BLACK, + }, + "TEST test" + ) .world_space = true; } -- cgit v1.2.3 From a5f8b34f4701863901e89abe5b0b604fd9e553b2 Mon Sep 17 00:00:00 2001 From: heavydemon21 Date: Sun, 22 Dec 2024 20:18:44 +0100 Subject: ui fixes for offset --- src/crepe/api/Button.cpp | 2 +- src/crepe/api/Button.h | 4 +++- src/crepe/api/Text.cpp | 5 +++-- src/crepe/api/Text.h | 5 +++-- src/crepe/api/UIObject.h | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/crepe/api/Button.cpp b/src/crepe/api/Button.cpp index c4f7f2d..8eadd89 100644 --- a/src/crepe/api/Button.cpp +++ b/src/crepe/api/Button.cpp @@ -3,7 +3,7 @@ namespace crepe { Button::Button( - game_object_id_t id, const vec2 & dimensions, const vec2 & offset, const Data & data + game_object_id_t id, const vec2 & dimensions, const Data & data, const vec2 & offset ) : UIObject(id, dimensions, offset), data(data) {} diff --git a/src/crepe/api/Button.h b/src/crepe/api/Button.h index f6d363a..d7dc747 100644 --- a/src/crepe/api/Button.h +++ b/src/crepe/api/Button.h @@ -1,6 +1,7 @@ #pragma once #include "UIObject.h" +#include "types.h" namespace crepe { @@ -33,7 +34,8 @@ public: * \param data additional data the button has */ Button( - game_object_id_t id, const vec2 & dimensions, const vec2 & offset, const Data & data + game_object_id_t id, const vec2 & dimensions, const Data & data, + const vec2 & offset = {0, 0} ); /** * \brief Get the maximum number of instances for this component diff --git a/src/crepe/api/Text.cpp b/src/crepe/api/Text.cpp index b24f0ac..29e36f1 100644 --- a/src/crepe/api/Text.cpp +++ b/src/crepe/api/Text.cpp @@ -1,10 +1,11 @@ #include "Text.h" +#include "types.h" using namespace crepe; Text::Text( - game_object_id_t id, const vec2 & dimensions, const vec2 & offset, - const std::string & font_family, const Data & data, const std::string & text + game_object_id_t id, const vec2 & dimensions, const std::string & font_family, + const Data & data, const vec2 & offset, const std::string & text ) : UIObject(id, dimensions, offset), text(text), diff --git a/src/crepe/api/Text.h b/src/crepe/api/Text.h index 0163bbb..37d86b4 100644 --- a/src/crepe/api/Text.h +++ b/src/crepe/api/Text.h @@ -6,6 +6,7 @@ #include "Asset.h" #include "Color.h" #include "UIObject.h" +#include "types.h" namespace crepe { /** @@ -35,8 +36,8 @@ public: * \param font Optional font asset that can be passed or left empty. */ Text( - game_object_id_t id, const vec2 & dimensions, const vec2 & offset, - const std::string & font_family, const Data & data, const std::string & text = "" + game_object_id_t id, const vec2 & dimensions, const std::string & font_family, + const Data & data, const vec2 & offset = {0, 0}, const std::string & text = "" ); //! Label text. diff --git a/src/crepe/api/UIObject.h b/src/crepe/api/UIObject.h index f7f4fba..5c1fdf7 100644 --- a/src/crepe/api/UIObject.h +++ b/src/crepe/api/UIObject.h @@ -15,7 +15,7 @@ public: * \param dimensions width and height of the UIObject * \param offset Offset relative to the GameObject Transform */ - UIObject(game_object_id_t id, const vec2 & dimensions, const vec2 & offset); + UIObject(game_object_id_t id, const vec2 & dimensions, const vec2 & offset = {0,0}); //! Width and height of the UIObject vec2 dimensions; //! Position offset relative to this GameObjects Transform -- cgit v1.2.3 From d15de7503f2f7320e23863a11e97fcd401bc2eeb Mon Sep 17 00:00:00 2001 From: Max-001 Date: Tue, 24 Dec 2024 09:45:44 +0100 Subject: Moved Player files to seperate folder --- game/GameScene.cpp | 2 +- game/PlayerScript.cpp | 11 ------ game/PlayerScript.h | 8 ----- game/PlayerSubScene.cpp | 76 ------------------------------------------ game/PlayerSubScene.h | 10 ------ game/player/PlayerScript.cpp | 11 ++++++ game/player/PlayerScript.h | 8 +++++ game/player/PlayerSubScene.cpp | 76 ++++++++++++++++++++++++++++++++++++++++++ game/player/PlayerSubScene.h | 10 ++++++ 9 files changed, 106 insertions(+), 106 deletions(-) delete mode 100644 game/PlayerScript.cpp delete mode 100644 game/PlayerScript.h delete mode 100644 game/PlayerSubScene.cpp delete mode 100644 game/PlayerSubScene.h create mode 100644 game/player/PlayerScript.cpp create mode 100644 game/player/PlayerScript.h create mode 100644 game/player/PlayerSubScene.cpp create mode 100644 game/player/PlayerSubScene.h diff --git a/game/GameScene.cpp b/game/GameScene.cpp index 2511567..ee9b7dd 100644 --- a/game/GameScene.cpp +++ b/game/GameScene.cpp @@ -1,10 +1,10 @@ #include "GameScene.h" #include "Config.h" #include "MoveCameraManualyScript.h" -#include "PlayerSubScene.h" #include "StartGameScript.h" #include "background/BackgroundSubScene.h" +#include "player/PlayerSubScene.h" #include #include diff --git a/game/PlayerScript.cpp b/game/PlayerScript.cpp deleted file mode 100644 index 1c388f5..0000000 --- a/game/PlayerScript.cpp +++ /dev/null @@ -1,11 +0,0 @@ -#include "PlayerScript.h" - -#include - -using namespace crepe; -using namespace std; - -void PlayerScript::fixed_update(crepe::duration_t dt) { - Rigidbody & rb = this->get_components_by_name("player").front(); - if (this->get_key_state(Keycode::SPACE)) rb.add_force_linear(vec2(0, -10)); -} diff --git a/game/PlayerScript.h b/game/PlayerScript.h deleted file mode 100644 index 84c4f7f..0000000 --- a/game/PlayerScript.h +++ /dev/null @@ -1,8 +0,0 @@ -#pragma once - -#include - -class PlayerScript : public crepe::Script { -public: - void fixed_update(crepe::duration_t dt); -}; diff --git a/game/PlayerSubScene.cpp b/game/PlayerSubScene.cpp deleted file mode 100644 index 00b7810..0000000 --- a/game/PlayerSubScene.cpp +++ /dev/null @@ -1,76 +0,0 @@ -#include "PlayerSubScene.h" -#include "Config.h" -#include "PlayerScript.h" - -#include -#include -#include -#include -#include - -using namespace crepe; -using namespace std; - -PlayerSubScene::PlayerSubScene(Scene & scn) { - GameObject player = scn.new_object("player", "player", vec2(-100, 200)); - Asset player_body_asset {"asset/barry/defaultBody.png"}; - Sprite & player_body_sprite = player.add_component( - player_body_asset, - Sprite::Data { - .sorting_in_layer = SORT_IN_LAY_PLAYER, - .order_in_layer = 0, - .size = vec2(0, 50), - } - ); - player.add_component( - player_body_sprite, ivec2(32, 32), uvec2(4, 8), - Animator::Data { - .fps = 5, - .looping = true, - } - ); - Asset player_head_asset {"asset/barry/defaultHead.png"}; - Sprite & player_head_sprite = player.add_component( - player_head_asset, - Sprite::Data { - .sorting_in_layer = SORT_IN_LAY_PLAYER, - .order_in_layer = 1, - .size = vec2(0, 50), - .position_offset = vec2(0, -20), - } - ); - player.add_component( - player_head_sprite, ivec2(32, 32), uvec2(4, 8), - Animator::Data { - .fps = 5, - .looping = true, - } - ); - Asset player_jetpack_asset {"asset/barry/jetpackDefault.png"}; - Sprite & player_jetpack_sprite = player.add_component( - player_jetpack_asset, - Sprite::Data { - .sorting_in_layer = SORT_IN_LAY_PLAYER, - .order_in_layer = 2, - .size = vec2(0, 60), - .position_offset = vec2(-20, 0), - } - ); - player_jetpack_sprite.active = false; - player.add_component( - player_jetpack_sprite, ivec2(32, 44), uvec2(4, 4), - Animator::Data { - .fps = 5, - .looping = true, - } - ); - player.add_component(Rigidbody::Data { - .gravity_scale = 20, - .body_type = Rigidbody::BodyType::DYNAMIC, - .linear_velocity = vec2(100, 0), - .collision_layers = {COLL_LAY_BOT_TOP}, - .collision_layer = COLL_LAY_PLAYER, - }); - player.add_component(vec2(50, 50)); - player.add_component().set_script().active = false; -} diff --git a/game/PlayerSubScene.h b/game/PlayerSubScene.h deleted file mode 100644 index bf94c32..0000000 --- a/game/PlayerSubScene.h +++ /dev/null @@ -1,10 +0,0 @@ -#pragma once - -namespace crepe { -class Scene; -} - -class PlayerSubScene { -public: - PlayerSubScene(crepe::Scene & scn); -}; diff --git a/game/player/PlayerScript.cpp b/game/player/PlayerScript.cpp new file mode 100644 index 0000000..1c388f5 --- /dev/null +++ b/game/player/PlayerScript.cpp @@ -0,0 +1,11 @@ +#include "PlayerScript.h" + +#include + +using namespace crepe; +using namespace std; + +void PlayerScript::fixed_update(crepe::duration_t dt) { + Rigidbody & rb = this->get_components_by_name("player").front(); + if (this->get_key_state(Keycode::SPACE)) rb.add_force_linear(vec2(0, -10)); +} diff --git a/game/player/PlayerScript.h b/game/player/PlayerScript.h new file mode 100644 index 0000000..84c4f7f --- /dev/null +++ b/game/player/PlayerScript.h @@ -0,0 +1,8 @@ +#pragma once + +#include + +class PlayerScript : public crepe::Script { +public: + void fixed_update(crepe::duration_t dt); +}; diff --git a/game/player/PlayerSubScene.cpp b/game/player/PlayerSubScene.cpp new file mode 100644 index 0000000..00b7810 --- /dev/null +++ b/game/player/PlayerSubScene.cpp @@ -0,0 +1,76 @@ +#include "PlayerSubScene.h" +#include "Config.h" +#include "PlayerScript.h" + +#include +#include +#include +#include +#include + +using namespace crepe; +using namespace std; + +PlayerSubScene::PlayerSubScene(Scene & scn) { + GameObject player = scn.new_object("player", "player", vec2(-100, 200)); + Asset player_body_asset {"asset/barry/defaultBody.png"}; + Sprite & player_body_sprite = player.add_component( + player_body_asset, + Sprite::Data { + .sorting_in_layer = SORT_IN_LAY_PLAYER, + .order_in_layer = 0, + .size = vec2(0, 50), + } + ); + player.add_component( + player_body_sprite, ivec2(32, 32), uvec2(4, 8), + Animator::Data { + .fps = 5, + .looping = true, + } + ); + Asset player_head_asset {"asset/barry/defaultHead.png"}; + Sprite & player_head_sprite = player.add_component( + player_head_asset, + Sprite::Data { + .sorting_in_layer = SORT_IN_LAY_PLAYER, + .order_in_layer = 1, + .size = vec2(0, 50), + .position_offset = vec2(0, -20), + } + ); + player.add_component( + player_head_sprite, ivec2(32, 32), uvec2(4, 8), + Animator::Data { + .fps = 5, + .looping = true, + } + ); + Asset player_jetpack_asset {"asset/barry/jetpackDefault.png"}; + Sprite & player_jetpack_sprite = player.add_component( + player_jetpack_asset, + Sprite::Data { + .sorting_in_layer = SORT_IN_LAY_PLAYER, + .order_in_layer = 2, + .size = vec2(0, 60), + .position_offset = vec2(-20, 0), + } + ); + player_jetpack_sprite.active = false; + player.add_component( + player_jetpack_sprite, ivec2(32, 44), uvec2(4, 4), + Animator::Data { + .fps = 5, + .looping = true, + } + ); + player.add_component(Rigidbody::Data { + .gravity_scale = 20, + .body_type = Rigidbody::BodyType::DYNAMIC, + .linear_velocity = vec2(100, 0), + .collision_layers = {COLL_LAY_BOT_TOP}, + .collision_layer = COLL_LAY_PLAYER, + }); + player.add_component(vec2(50, 50)); + player.add_component().set_script().active = false; +} diff --git a/game/player/PlayerSubScene.h b/game/player/PlayerSubScene.h new file mode 100644 index 0000000..bf94c32 --- /dev/null +++ b/game/player/PlayerSubScene.h @@ -0,0 +1,10 @@ +#pragma once + +namespace crepe { +class Scene; +} + +class PlayerSubScene { +public: + PlayerSubScene(crepe::Scene & scn); +}; -- cgit v1.2.3 From a5d68e4ea0a858235aee47339af0b223c87817c5 Mon Sep 17 00:00:00 2001 From: Max-001 Date: Tue, 24 Dec 2024 09:46:45 +0100 Subject: Moved Player files to seperate folder --- game/player/PlayerSubScene.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/game/player/PlayerSubScene.cpp b/game/player/PlayerSubScene.cpp index 00b7810..42b969c 100644 --- a/game/player/PlayerSubScene.cpp +++ b/game/player/PlayerSubScene.cpp @@ -1,7 +1,8 @@ #include "PlayerSubScene.h" -#include "Config.h" #include "PlayerScript.h" +#include "../Config.h" + #include #include #include -- cgit v1.2.3 From b9051627db1741fe373c08ab43170c257625073f Mon Sep 17 00:00:00 2001 From: heavydemon21 Date: Tue, 24 Dec 2024 09:49:49 +0100 Subject: feedback --- src/crepe/api/Button.h | 8 +++++--- src/crepe/api/Text.cpp | 3 ++- src/crepe/api/Text.h | 3 ++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/crepe/api/Button.h b/src/crepe/api/Button.h index d7dc747..e986c04 100644 --- a/src/crepe/api/Button.h +++ b/src/crepe/api/Button.h @@ -1,7 +1,8 @@ #pragma once +#include "../types.h" + #include "UIObject.h" -#include "types.h" namespace crepe { @@ -46,13 +47,14 @@ public: */ virtual int get_instances_max() const { return 1; } +public: + Data data; + private: //! friend relation hover variable friend class InputSystem; //! Indicates whether the mouse is currently hovering over the button bool hover = false; - - Data data; }; } // namespace crepe diff --git a/src/crepe/api/Text.cpp b/src/crepe/api/Text.cpp index 29e36f1..e5b623d 100644 --- a/src/crepe/api/Text.cpp +++ b/src/crepe/api/Text.cpp @@ -1,5 +1,6 @@ +#include "../types.h" + #include "Text.h" -#include "types.h" using namespace crepe; diff --git a/src/crepe/api/Text.h b/src/crepe/api/Text.h index 37d86b4..8b3d53e 100644 --- a/src/crepe/api/Text.h +++ b/src/crepe/api/Text.h @@ -3,10 +3,11 @@ #include #include +#include "../types.h" + #include "Asset.h" #include "Color.h" #include "UIObject.h" -#include "types.h" namespace crepe { /** -- cgit v1.2.3 From 4526efe1b6dd63aaa177f8f35194989d3910d571 Mon Sep 17 00:00:00 2001 From: heavydemon21 Date: Tue, 24 Dec 2024 09:50:10 +0100 Subject: make format --- src/crepe/api/UIObject.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/crepe/api/UIObject.h b/src/crepe/api/UIObject.h index 5c1fdf7..0d9b1f7 100644 --- a/src/crepe/api/UIObject.h +++ b/src/crepe/api/UIObject.h @@ -15,7 +15,7 @@ public: * \param dimensions width and height of the UIObject * \param offset Offset relative to the GameObject Transform */ - UIObject(game_object_id_t id, const vec2 & dimensions, const vec2 & offset = {0,0}); + UIObject(game_object_id_t id, const vec2 & dimensions, const vec2 & offset = {0, 0}); //! Width and height of the UIObject vec2 dimensions; //! Position offset relative to this GameObjects Transform -- cgit v1.2.3 From f663aa291713be3e9e7cf70707d6a23b128d1ab4 Mon Sep 17 00:00:00 2001 From: Max-001 Date: Tue, 24 Dec 2024 09:52:50 +0100 Subject: Moved Player files to seperate folder --- game/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt index 937b5e6..c3a2d52 100644 --- a/game/CMakeLists.txt +++ b/game/CMakeLists.txt @@ -16,8 +16,8 @@ add_executable(main GameScene.cpp background/HallwaySubScene.cpp MoveCameraManualyScript.cpp - PlayerScript.cpp - PlayerSubScene.cpp + player/PlayerScript.cpp + player/PlayerSubScene.cpp StartGameScript.cpp background/StartSubScene.cpp main.cpp -- cgit v1.2.3 From 2691f8ef665d38f04d6aa8f38681b68ca0c852ea Mon Sep 17 00:00:00 2001 From: Max-001 Date: Tue, 24 Dec 2024 09:54:33 +0100 Subject: Added correct colliders --- game/player/PlayerSubScene.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/game/player/PlayerSubScene.cpp b/game/player/PlayerSubScene.cpp index 42b969c..2e73546 100644 --- a/game/player/PlayerSubScene.cpp +++ b/game/player/PlayerSubScene.cpp @@ -2,8 +2,11 @@ #include "PlayerScript.h" #include "../Config.h" +#include "api/BoxCollider.h" +#include "types.h" #include +#include #include #include #include @@ -30,6 +33,7 @@ PlayerSubScene::PlayerSubScene(Scene & scn) { .looping = true, } ); + player.add_component(vec2(50, 50)); Asset player_head_asset {"asset/barry/defaultHead.png"}; Sprite & player_head_sprite = player.add_component( player_head_asset, @@ -47,6 +51,7 @@ PlayerSubScene::PlayerSubScene(Scene & scn) { .looping = true, } ); + player.add_component(25, vec2(0, -20)); Asset player_jetpack_asset {"asset/barry/jetpackDefault.png"}; Sprite & player_jetpack_sprite = player.add_component( player_jetpack_asset, @@ -65,6 +70,7 @@ PlayerSubScene::PlayerSubScene(Scene & scn) { .looping = true, } ); + player.add_component(vec2(40, 60), vec2(-20, 0)); player.add_component(Rigidbody::Data { .gravity_scale = 20, .body_type = Rigidbody::BodyType::DYNAMIC, @@ -72,6 +78,5 @@ PlayerSubScene::PlayerSubScene(Scene & scn) { .collision_layers = {COLL_LAY_BOT_TOP}, .collision_layer = COLL_LAY_PLAYER, }); - player.add_component(vec2(50, 50)); player.add_component().set_script().active = false; } -- cgit v1.2.3 From 0bfc194d2c31d111ad438c040d4b0b74238d4ef6 Mon Sep 17 00:00:00 2001 From: Max-001 Date: Tue, 24 Dec 2024 10:51:26 +0100 Subject: Stop looping at last frame instead of start frame --- src/crepe/system/AnimatorSystem.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/crepe/system/AnimatorSystem.cpp b/src/crepe/system/AnimatorSystem.cpp index e5ab2fa..0a5a417 100644 --- a/src/crepe/system/AnimatorSystem.cpp +++ b/src/crepe/system/AnimatorSystem.cpp @@ -1,6 +1,7 @@ #include "../api/Animator.h" #include "../manager/ComponentManager.h" #include "../manager/LoopTimerManager.h" +#include "util/Log.h" #include #include "AnimatorSystem.h" @@ -29,12 +30,13 @@ void AnimatorSystem::frame_update() { int curr_frame = static_cast(elapsed_time / frame_duration) % total_frames; - ctx.row = ctx.cycle_start + curr_frame; - a.spritesheet.mask.x = ctx.row * a.spritesheet.mask.w; - a.spritesheet.mask.y = (ctx.col * a.spritesheet.mask.h); - if (!ctx.looping && curr_frame == ctx.cycle_start && last_frame == total_frames - 1) { a.active = false; + continue; } + + ctx.row = ctx.cycle_start + curr_frame; + a.spritesheet.mask.x = ctx.row * a.spritesheet.mask.w; + a.spritesheet.mask.y = (ctx.col * a.spritesheet.mask.h); } } -- cgit v1.2.3 From 8f8d579389303184038addc77c1acffdb2081f91 Mon Sep 17 00:00:00 2001 From: Max-001 Date: Tue, 24 Dec 2024 10:52:36 +0100 Subject: Added correct animations --- game/player/PlayerScript.cpp | 35 ++++++++++++++++++++++++++++++++++- game/player/PlayerScript.h | 3 +++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/game/player/PlayerScript.cpp b/game/player/PlayerScript.cpp index 1c388f5..874324e 100644 --- a/game/player/PlayerScript.cpp +++ b/game/player/PlayerScript.cpp @@ -1,11 +1,44 @@ #include "PlayerScript.h" +#include #include +#include +#include using namespace crepe; using namespace std; void PlayerScript::fixed_update(crepe::duration_t dt) { + RefVector animators = this->get_components_by_name("player"); + Transform & transform = this->get_components_by_name("player").front(); + Rigidbody & rb = this->get_components_by_name("player").front(); - if (this->get_key_state(Keycode::SPACE)) rb.add_force_linear(vec2(0, -10)); + if (this->get_key_state(Keycode::SPACE)) { + rb.add_force_linear(vec2(0, -10)); + if (prev_anim != 1) { + for (Animator & anim : animators) { + anim.active = true; + anim.set_anim(1); + anim.data.looping = true; + prev_anim = 1; + } + } + } else if (transform.position.y == 195) { + if (prev_anim != 0) { + for (Animator & anim : animators) { + anim.active = true; + anim.set_anim(0); + anim.data.looping = true; + prev_anim = 0; + } + } + } else { + if (prev_anim != 2) { + for (Animator & anim : animators) { + anim.set_anim(2); + anim.data.looping = false; + prev_anim = 2; + } + } + } } diff --git a/game/player/PlayerScript.h b/game/player/PlayerScript.h index 84c4f7f..dfd02eb 100644 --- a/game/player/PlayerScript.h +++ b/game/player/PlayerScript.h @@ -5,4 +5,7 @@ class PlayerScript : public crepe::Script { public: void fixed_update(crepe::duration_t dt); + +private: + int prev_anim = 0; }; -- cgit v1.2.3 From 7a6658510ba48c2fbe77e50f36452b0407f7d840 Mon Sep 17 00:00:00 2001 From: Max-001 Date: Tue, 24 Dec 2024 11:36:19 +0100 Subject: Implemented particle emmitters --- game/player/PlayerScript.cpp | 16 ++++++++++ game/player/PlayerSubScene.cpp | 68 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+) diff --git a/game/player/PlayerScript.cpp b/game/player/PlayerScript.cpp index 874324e..04e7264 100644 --- a/game/player/PlayerScript.cpp +++ b/game/player/PlayerScript.cpp @@ -1,6 +1,7 @@ #include "PlayerScript.h" #include +#include #include #include #include @@ -10,8 +11,14 @@ using namespace std; void PlayerScript::fixed_update(crepe::duration_t dt) { RefVector animators = this->get_components_by_name("player"); + RefVector emitters + = this->get_components_by_name("player"); Transform & transform = this->get_components_by_name("player").front(); + for (ParticleEmitter & emitter : emitters) { + emitter.data.boundary.offset = vec2(0, -transform.position.y); + } + Rigidbody & rb = this->get_components_by_name("player").front(); if (this->get_key_state(Keycode::SPACE)) { rb.add_force_linear(vec2(0, -10)); @@ -22,6 +29,9 @@ void PlayerScript::fixed_update(crepe::duration_t dt) { anim.data.looping = true; prev_anim = 1; } + for (ParticleEmitter & emitter : emitters) { + emitter.data.emission_rate = 30; + } } } else if (transform.position.y == 195) { if (prev_anim != 0) { @@ -31,6 +41,9 @@ void PlayerScript::fixed_update(crepe::duration_t dt) { anim.data.looping = true; prev_anim = 0; } + for (ParticleEmitter & emitter : emitters) { + emitter.data.emission_rate = 0; + } } } else { if (prev_anim != 2) { @@ -39,6 +52,9 @@ void PlayerScript::fixed_update(crepe::duration_t dt) { anim.data.looping = false; prev_anim = 2; } + for (ParticleEmitter & emitter : emitters) { + emitter.data.emission_rate = 0; + } } } } diff --git a/game/player/PlayerSubScene.cpp b/game/player/PlayerSubScene.cpp index 2e73546..166d54b 100644 --- a/game/player/PlayerSubScene.cpp +++ b/game/player/PlayerSubScene.cpp @@ -3,6 +3,7 @@ #include "../Config.h" #include "api/BoxCollider.h" +#include "api/ParticleEmitter.h" #include "types.h" #include @@ -17,6 +18,73 @@ using namespace std; PlayerSubScene::PlayerSubScene(Scene & scn) { GameObject player = scn.new_object("player", "player", vec2(-100, 200)); + + Asset player_bullet {"asset/other_effects/effect_smgbullet.png"}; + Sprite & player_bullet_sprite = player.add_component( + player_bullet, + Sprite::Data { + .sorting_in_layer = SORT_IN_LAY_PLAYER, + .order_in_layer = 3, + .size = vec2(0, 6), + } + ); + player.add_component(player_bullet_sprite, ParticleEmitter::Data{ + .offset = vec2(-15, 15), + .emission_rate = 0, + .min_speed = 300, + .max_speed = 500, + .min_angle = 85, + .max_angle = 100, + .boundary = ParticleEmitter::Boundary { + .height = 400, + .reset_on_exit = true, + }, + }); + Asset player_bullet_x2 {"asset/other_effects/effect_smgbullet_x2.png"}; + Sprite & player_bullet_x2_sprite = player.add_component( + player_bullet_x2, + Sprite::Data { + .sorting_in_layer = SORT_IN_LAY_PLAYER, + .order_in_layer = 3, + .size = vec2(0, 12), + } + ); + player.add_component(player_bullet_x2_sprite, ParticleEmitter::Data{ + .offset = vec2(-15, 15), + .emission_rate = 0, + .min_speed = 300, + .max_speed = 500, + .min_angle = 85, + .max_angle = 100, + .boundary = ParticleEmitter::Boundary { + .height = 400, + .reset_on_exit = true, + }, + }); + Asset player_shell {"asset/other_effects/effect_rocketmgshell_TVOS.png"}; + Sprite & player_shell_sprite = player.add_component( + player_shell, + Sprite::Data { + .sorting_in_layer = SORT_IN_LAY_PLAYER, + .order_in_layer = 3, + .size = vec2(0, 12), + .angle_offset = 90, + } + ); + player.add_component(player_shell_sprite, ParticleEmitter::Data{ + .offset = vec2(-15, 15), + .emission_rate = 0, + .min_speed = 200, + .max_speed = 500, + .min_angle = 110, + .max_angle = 120, + .force_over_time = vec2(0, 1000), + .boundary = ParticleEmitter::Boundary { + .height = 400, + .reset_on_exit = true, + }, + }); + Asset player_body_asset {"asset/barry/defaultBody.png"}; Sprite & player_body_sprite = player.add_component( player_body_asset, -- cgit v1.2.3 From 46cc8767338578cbacb5a61bf50bbca71ea8e538 Mon Sep 17 00:00:00 2001 From: Max-001 Date: Tue, 24 Dec 2024 11:37:40 +0100 Subject: Make format --- game/player/PlayerSubScene.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/game/player/PlayerSubScene.cpp b/game/player/PlayerSubScene.cpp index 166d54b..ccf3d42 100644 --- a/game/player/PlayerSubScene.cpp +++ b/game/player/PlayerSubScene.cpp @@ -2,16 +2,16 @@ #include "PlayerScript.h" #include "../Config.h" -#include "api/BoxCollider.h" -#include "api/ParticleEmitter.h" -#include "types.h" #include +#include #include #include +#include #include #include #include +#include using namespace crepe; using namespace std; -- cgit v1.2.3 From 192aea3112af0b36f6f26670e66c7e24926c579a Mon Sep 17 00:00:00 2001 From: Max-001 Date: Tue, 24 Dec 2024 12:10:28 +0100 Subject: Added collision animations --- game/Config.h | 3 +++ game/GameScene.cpp | 50 +++++++++++++++++++++++++++++++++++++++ game/player/PlayerScript.cpp | 53 ++++++++++++++++++++++++++++++++++++++++++ game/player/PlayerScript.h | 5 ++++ game/player/PlayerSubScene.cpp | 3 ++- 5 files changed, 113 insertions(+), 1 deletion(-) diff --git a/game/Config.h b/game/Config.h index ec753df..796ad6c 100644 --- a/game/Config.h +++ b/game/Config.h @@ -13,6 +13,9 @@ static constexpr int COLL_LAY_BOT_LOW = 2; // Only for GameScene static constexpr int COLL_LAY_BOT_HIGH = 3; // Only for GameScene static constexpr int COLL_LAY_PLAYER = 4; // Only for GameScene static constexpr int COLL_LAY_WALL_FRAGS = 5; // Only for GameScene +static constexpr int COLL_LAY_ZAPPER = 6; // Only for GameScene +static constexpr int COLL_LAY_LASER = 7; // Only for GameScene +static constexpr int COLL_LAY_MISSILE = 8; // Only for GameScene static constexpr int GAME_HEIGHT = 800; // In game units diff --git a/game/GameScene.cpp b/game/GameScene.cpp index ee9b7dd..821191d 100644 --- a/game/GameScene.cpp +++ b/game/GameScene.cpp @@ -66,6 +66,56 @@ void GameScene::load_scene() { GameObject start_game_script = new_object("start_game_script", "script", vec2(0, 0)); start_game_script.add_component().set_script(); + + // zapper, laser and missile (below) for testing purpose only!!! + GameObject zapper = new_object("zapper", "zapper", vec2(1000, 0)); + Asset zapper_asset {"asset/obstacles/zapper/regular_zappers/zapEffect.png"}; + Sprite & zapper_sprite = zapper.add_component( + zapper_asset, + Sprite::Data { + .sorting_in_layer = SORT_IN_LAY_OBSTACLES, + .order_in_layer = 0, + .size = vec2(100, 100), + } + ); + zapper.add_component(Rigidbody::Data { + .body_type = Rigidbody::BodyType::KINEMATIC, + .kinematic_collision = false, + .collision_layer = COLL_LAY_ZAPPER, + }); + zapper.add_component(vec2(100, 100)); + GameObject laser = new_object("laser", "laser", vec2(2000, 0)); + Asset laser_asset {"asset/obstacles/laser/laserPower.png"}; + Sprite & laser_sprite = laser.add_component( + laser_asset, + Sprite::Data { + .sorting_in_layer = SORT_IN_LAY_OBSTACLES, + .order_in_layer = 0, + .size = vec2(100, 100), + } + ); + laser.add_component(Rigidbody::Data { + .body_type = Rigidbody::BodyType::KINEMATIC, + .kinematic_collision = false, + .collision_layer = COLL_LAY_LASER, + }); + laser.add_component(vec2(100, 100)); + GameObject missile = new_object("missile", "missile", vec2(3000, 0)); + Asset missile_asset {"asset/obstacles/missile/missile.png"}; + Sprite & missile_sprite = missile.add_component( + missile_asset, + Sprite::Data { + .sorting_in_layer = SORT_IN_LAY_OBSTACLES, + .order_in_layer = 0, + .size = vec2(100, 100), + } + ); + missile.add_component(Rigidbody::Data { + .body_type = Rigidbody::BodyType::KINEMATIC, + .kinematic_collision = false, + .collision_layer = COLL_LAY_MISSILE, + }); + missile.add_component(vec2(100, 100)); } string GameScene::get_name() const { return "scene1"; } diff --git a/game/player/PlayerScript.cpp b/game/player/PlayerScript.cpp index 04e7264..1a5d497 100644 --- a/game/player/PlayerScript.cpp +++ b/game/player/PlayerScript.cpp @@ -9,6 +9,59 @@ using namespace crepe; using namespace std; +void PlayerScript::init() { + subscribe([this](const CollisionEvent & ev) -> bool { + return this->on_collision(ev); + }); +} + +bool PlayerScript::on_collision(const CollisionEvent & ev) { + BehaviorScript & play_scr = this->get_components_by_name("player").front(); + RefVector animators = this->get_components_by_name("player"); + RefVector emitters + = this->get_components_by_name("player"); + + if (ev.info.other.metadata.tag == "zapper") { + for (Animator & anim : animators) { + anim.active = true; + anim.set_anim(4); + anim.data.looping = true; + prev_anim = 0; + } + for (ParticleEmitter & emitter : emitters) { + emitter.data.emission_rate = 0; + } + play_scr.active = false; + return true; + } else if (ev.info.other.metadata.tag == "laser") { + for (Animator & anim : animators) { + anim.active = true; + anim.set_anim(4); + anim.data.looping = true; + prev_anim = 0; + } + for (ParticleEmitter & emitter : emitters) { + emitter.data.emission_rate = 0; + } + play_scr.active = false; + return true; + } else if (ev.info.other.metadata.tag == "missile") { + for (Animator & anim : animators) { + anim.active = true; + anim.set_anim(5); + anim.data.looping = true; + prev_anim = 0; + } + for (ParticleEmitter & emitter : emitters) { + emitter.data.emission_rate = 0; + } + play_scr.active = false; + return true; + } + + return false; +} + void PlayerScript::fixed_update(crepe::duration_t dt) { RefVector animators = this->get_components_by_name("player"); RefVector emitters diff --git a/game/player/PlayerScript.h b/game/player/PlayerScript.h index dfd02eb..d8eb098 100644 --- a/game/player/PlayerScript.h +++ b/game/player/PlayerScript.h @@ -1,11 +1,16 @@ #pragma once +#include #include class PlayerScript : public crepe::Script { public: + void init(); void fixed_update(crepe::duration_t dt); +private: + bool on_collision(const crepe::CollisionEvent & ev); + private: int prev_anim = 0; }; diff --git a/game/player/PlayerSubScene.cpp b/game/player/PlayerSubScene.cpp index ccf3d42..812d99a 100644 --- a/game/player/PlayerSubScene.cpp +++ b/game/player/PlayerSubScene.cpp @@ -143,7 +143,8 @@ PlayerSubScene::PlayerSubScene(Scene & scn) { .gravity_scale = 20, .body_type = Rigidbody::BodyType::DYNAMIC, .linear_velocity = vec2(100, 0), - .collision_layers = {COLL_LAY_BOT_TOP}, + .collision_layers + = {COLL_LAY_BOT_TOP, COLL_LAY_ZAPPER, COLL_LAY_LASER, COLL_LAY_MISSILE}, .collision_layer = COLL_LAY_PLAYER, }); player.add_component().set_script().active = false; -- cgit v1.2.3 From a0a3e7e2d12d3acb7bf4073cb5a10c08047cd08e Mon Sep 17 00:00:00 2001 From: Max-001 Date: Tue, 24 Dec 2024 12:14:51 +0100 Subject: Added EndGameScript --- game/CMakeLists.txt | 1 + game/EndGameScript.cpp | 6 ++++++ game/EndGameScript.h | 8 ++++++++ game/GameScene.cpp | 3 +++ game/player/PlayerScript.cpp | 6 ++++++ 5 files changed, 24 insertions(+) create mode 100644 game/EndGameScript.cpp create mode 100644 game/EndGameScript.h diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt index c3a2d52..33ceaf4 100644 --- a/game/CMakeLists.txt +++ b/game/CMakeLists.txt @@ -19,6 +19,7 @@ add_executable(main player/PlayerScript.cpp player/PlayerSubScene.cpp StartGameScript.cpp + EndGameScript.cpp background/StartSubScene.cpp main.cpp ) diff --git a/game/EndGameScript.cpp b/game/EndGameScript.cpp new file mode 100644 index 0000000..4d7b5fd --- /dev/null +++ b/game/EndGameScript.cpp @@ -0,0 +1,6 @@ +#include "EndGameScript.h" + +void EndGameScript::fixed_update(crepe::duration_t dt) { + logf("EndGameScript::fixed_update"); + // ... +} diff --git a/game/EndGameScript.h b/game/EndGameScript.h new file mode 100644 index 0000000..b63ac9d --- /dev/null +++ b/game/EndGameScript.h @@ -0,0 +1,8 @@ +#pragma once + +#include + +class EndGameScript : public crepe::Script { +public: + void fixed_update(crepe::duration_t dt); +}; diff --git a/game/GameScene.cpp b/game/GameScene.cpp index 821191d..b471484 100644 --- a/game/GameScene.cpp +++ b/game/GameScene.cpp @@ -1,5 +1,6 @@ #include "GameScene.h" #include "Config.h" +#include "EndGameScript.h" #include "MoveCameraManualyScript.h" #include "StartGameScript.h" @@ -66,6 +67,8 @@ void GameScene::load_scene() { GameObject start_game_script = new_object("start_game_script", "script", vec2(0, 0)); start_game_script.add_component().set_script(); + GameObject end_game_script = new_object("end_game_script", "script", vec2(0, 0)); + end_game_script.add_component().set_script().active = false; // zapper, laser and missile (below) for testing purpose only!!! GameObject zapper = new_object("zapper", "zapper", vec2(1000, 0)); diff --git a/game/player/PlayerScript.cpp b/game/player/PlayerScript.cpp index 1a5d497..de53fc7 100644 --- a/game/player/PlayerScript.cpp +++ b/game/player/PlayerScript.cpp @@ -1,4 +1,5 @@ #include "PlayerScript.h" +#include "api/BehaviorScript.h" #include #include @@ -17,6 +18,8 @@ void PlayerScript::init() { bool PlayerScript::on_collision(const CollisionEvent & ev) { BehaviorScript & play_scr = this->get_components_by_name("player").front(); + BehaviorScript & end_scr + = this->get_components_by_name("end_game_script").front(); RefVector animators = this->get_components_by_name("player"); RefVector emitters = this->get_components_by_name("player"); @@ -32,6 +35,7 @@ bool PlayerScript::on_collision(const CollisionEvent & ev) { emitter.data.emission_rate = 0; } play_scr.active = false; + end_scr.active = true; return true; } else if (ev.info.other.metadata.tag == "laser") { for (Animator & anim : animators) { @@ -44,6 +48,7 @@ bool PlayerScript::on_collision(const CollisionEvent & ev) { emitter.data.emission_rate = 0; } play_scr.active = false; + end_scr.active = true; return true; } else if (ev.info.other.metadata.tag == "missile") { for (Animator & anim : animators) { @@ -56,6 +61,7 @@ bool PlayerScript::on_collision(const CollisionEvent & ev) { emitter.data.emission_rate = 0; } play_scr.active = false; + end_scr.active = true; return true; } -- cgit v1.2.3 From 9cdc0a89d9b6f504eeef888f845751977b1bc769 Mon Sep 17 00:00:00 2001 From: Max-001 Date: Tue, 24 Dec 2024 12:17:32 +0100 Subject: Added init --- game/EndGameScript.cpp | 5 +++++ game/EndGameScript.h | 1 + 2 files changed, 6 insertions(+) diff --git a/game/EndGameScript.cpp b/game/EndGameScript.cpp index 4d7b5fd..6b9c47f 100644 --- a/game/EndGameScript.cpp +++ b/game/EndGameScript.cpp @@ -1,5 +1,10 @@ #include "EndGameScript.h" +void EndGameScript::init() { + logf("EndGameScript::init"); + // ... +} + void EndGameScript::fixed_update(crepe::duration_t dt) { logf("EndGameScript::fixed_update"); // ... diff --git a/game/EndGameScript.h b/game/EndGameScript.h index b63ac9d..3b1970a 100644 --- a/game/EndGameScript.h +++ b/game/EndGameScript.h @@ -4,5 +4,6 @@ class EndGameScript : public crepe::Script { public: + void init(); void fixed_update(crepe::duration_t dt); }; -- cgit v1.2.3 From 81c25a7aa3722e2a65ccae29d22aa37bc5d1bc70 Mon Sep 17 00:00:00 2001 From: Max-001 Date: Tue, 24 Dec 2024 12:23:15 +0100 Subject: Slowed down at end --- game/EndGameScript.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/game/EndGameScript.cpp b/game/EndGameScript.cpp index 6b9c47f..55f08cd 100644 --- a/game/EndGameScript.cpp +++ b/game/EndGameScript.cpp @@ -1,11 +1,20 @@ #include "EndGameScript.h" +#include +#include + +using namespace crepe; +using namespace std; + void EndGameScript::init() { - logf("EndGameScript::init"); - // ... + Rigidbody & rb_player = this->get_components_by_name("player").front(); + Rigidbody & rb_camera = this->get_components_by_name("camera").front(); + + rb_player.data.linear_velocity_coefficient = vec2(0.8, 0.8); + rb_camera.data.linear_velocity_coefficient = vec2(0.8, 0.8); } void EndGameScript::fixed_update(crepe::duration_t dt) { - logf("EndGameScript::fixed_update"); + //logf("EndGameScript::fixed_update"); // ... } -- cgit v1.2.3 From a764ef0f1f6b7c5d18155163d63db1a6dd47093a Mon Sep 17 00:00:00 2001 From: Max-001 Date: Tue, 24 Dec 2024 14:38:01 +0100 Subject: Added end script --- game/EndGameScript.cpp | 54 +++++++++++++++++++++++++++++++++++++++++++------- game/EndGameScript.h | 3 +++ 2 files changed, 50 insertions(+), 7 deletions(-) diff --git a/game/EndGameScript.cpp b/game/EndGameScript.cpp index 55f08cd..a18f18c 100644 --- a/game/EndGameScript.cpp +++ b/game/EndGameScript.cpp @@ -1,5 +1,8 @@ #include "EndGameScript.h" +#include +#include +#include #include #include @@ -7,14 +10,51 @@ using namespace crepe; using namespace std; void EndGameScript::init() { - Rigidbody & rb_player = this->get_components_by_name("player").front(); - Rigidbody & rb_camera = this->get_components_by_name("camera").front(); - - rb_player.data.linear_velocity_coefficient = vec2(0.8, 0.8); - rb_camera.data.linear_velocity_coefficient = vec2(0.8, 0.8); + BoxCollider jetpack_coll = this->get_components_by_name("player").back(); + CircleCollider head_coll = this->get_components_by_name("player").back(); + jetpack_coll.active = false; + head_coll.active = false; } void EndGameScript::fixed_update(crepe::duration_t dt) { - //logf("EndGameScript::fixed_update"); - // ... + Transform & transform_player = this->get_components_by_name("player").front(); + RefVector anim_player = this->get_components_by_name("player"); + Rigidbody & rb_player = this->get_components_by_name("player").front(); + Rigidbody & rb_camera = this->get_components_by_name("camera").front(); + + if (transform_player.position.y >= 194) { + if (jump == 0 || jump == 1) { + int random_number = rand() % 4; + for (Animator & anim : anim_player) { + anim.active = false; + anim.set_anim(6); + for (int i = 0; i < random_number; i++) { + anim.next_anim(); + } + } + } else if (jump == 2) { + for (Animator & anim : anim_player) { + anim.active = false; + anim.set_anim(7); + } + rb_player.data.angular_velocity = 0; + transform_player.rotation = 90; + } + if (jump == 0) { + rb_player.data.linear_velocity = vec2(100, -150); + rb_player.data.angular_velocity = 320; + rb_player.data.angular_velocity_coefficient = 0.8; + jump++; + } else if (jump == 1) { + rb_player.data.linear_velocity = vec2(100, -125); + rb_player.data.angular_velocity = 300; + rb_player.data.angular_velocity_coefficient = 0.8; + jump++; + } else if (jump == 2) { + rb_player.data.linear_velocity = vec2(100, 0); + rb_player.data.linear_velocity_coefficient = vec2(0.5, 0.5); + rb_camera.data.linear_velocity_coefficient = vec2(0.5, 0.5); + jump++; + } + } } diff --git a/game/EndGameScript.h b/game/EndGameScript.h index 3b1970a..980dff5 100644 --- a/game/EndGameScript.h +++ b/game/EndGameScript.h @@ -6,4 +6,7 @@ class EndGameScript : public crepe::Script { public: void init(); void fixed_update(crepe::duration_t dt); + +private: + int jump = 0; }; -- cgit v1.2.3 From abbfe5d06697b93de485dcfe975812befc018a00 Mon Sep 17 00:00:00 2001 From: Max-001 Date: Tue, 24 Dec 2024 16:31:58 +0100 Subject: Moved EndGameScript to Player --- game/CMakeLists.txt | 2 +- game/EndGameScript.cpp | 60 ----------------------------------------- game/EndGameScript.h | 12 --------- game/GameScene.cpp | 3 --- game/player/PlayerEndScript.cpp | 60 +++++++++++++++++++++++++++++++++++++++++ game/player/PlayerEndScript.h | 12 +++++++++ game/player/PlayerScript.cpp | 3 +-- game/player/PlayerSubScene.cpp | 2 ++ 8 files changed, 76 insertions(+), 78 deletions(-) delete mode 100644 game/EndGameScript.cpp delete mode 100644 game/EndGameScript.h create mode 100644 game/player/PlayerEndScript.cpp create mode 100644 game/player/PlayerEndScript.h diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt index 33ceaf4..8e3692b 100644 --- a/game/CMakeLists.txt +++ b/game/CMakeLists.txt @@ -19,7 +19,7 @@ add_executable(main player/PlayerScript.cpp player/PlayerSubScene.cpp StartGameScript.cpp - EndGameScript.cpp + player/PlayerEndScript.cpp background/StartSubScene.cpp main.cpp ) diff --git a/game/EndGameScript.cpp b/game/EndGameScript.cpp deleted file mode 100644 index a18f18c..0000000 --- a/game/EndGameScript.cpp +++ /dev/null @@ -1,60 +0,0 @@ -#include "EndGameScript.h" - -#include -#include -#include -#include -#include - -using namespace crepe; -using namespace std; - -void EndGameScript::init() { - BoxCollider jetpack_coll = this->get_components_by_name("player").back(); - CircleCollider head_coll = this->get_components_by_name("player").back(); - jetpack_coll.active = false; - head_coll.active = false; -} - -void EndGameScript::fixed_update(crepe::duration_t dt) { - Transform & transform_player = this->get_components_by_name("player").front(); - RefVector anim_player = this->get_components_by_name("player"); - Rigidbody & rb_player = this->get_components_by_name("player").front(); - Rigidbody & rb_camera = this->get_components_by_name("camera").front(); - - if (transform_player.position.y >= 194) { - if (jump == 0 || jump == 1) { - int random_number = rand() % 4; - for (Animator & anim : anim_player) { - anim.active = false; - anim.set_anim(6); - for (int i = 0; i < random_number; i++) { - anim.next_anim(); - } - } - } else if (jump == 2) { - for (Animator & anim : anim_player) { - anim.active = false; - anim.set_anim(7); - } - rb_player.data.angular_velocity = 0; - transform_player.rotation = 90; - } - if (jump == 0) { - rb_player.data.linear_velocity = vec2(100, -150); - rb_player.data.angular_velocity = 320; - rb_player.data.angular_velocity_coefficient = 0.8; - jump++; - } else if (jump == 1) { - rb_player.data.linear_velocity = vec2(100, -125); - rb_player.data.angular_velocity = 300; - rb_player.data.angular_velocity_coefficient = 0.8; - jump++; - } else if (jump == 2) { - rb_player.data.linear_velocity = vec2(100, 0); - rb_player.data.linear_velocity_coefficient = vec2(0.5, 0.5); - rb_camera.data.linear_velocity_coefficient = vec2(0.5, 0.5); - jump++; - } - } -} diff --git a/game/EndGameScript.h b/game/EndGameScript.h deleted file mode 100644 index 980dff5..0000000 --- a/game/EndGameScript.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once - -#include - -class EndGameScript : public crepe::Script { -public: - void init(); - void fixed_update(crepe::duration_t dt); - -private: - int jump = 0; -}; diff --git a/game/GameScene.cpp b/game/GameScene.cpp index b471484..821191d 100644 --- a/game/GameScene.cpp +++ b/game/GameScene.cpp @@ -1,6 +1,5 @@ #include "GameScene.h" #include "Config.h" -#include "EndGameScript.h" #include "MoveCameraManualyScript.h" #include "StartGameScript.h" @@ -67,8 +66,6 @@ void GameScene::load_scene() { GameObject start_game_script = new_object("start_game_script", "script", vec2(0, 0)); start_game_script.add_component().set_script(); - GameObject end_game_script = new_object("end_game_script", "script", vec2(0, 0)); - end_game_script.add_component().set_script().active = false; // zapper, laser and missile (below) for testing purpose only!!! GameObject zapper = new_object("zapper", "zapper", vec2(1000, 0)); diff --git a/game/player/PlayerEndScript.cpp b/game/player/PlayerEndScript.cpp new file mode 100644 index 0000000..c0b4e74 --- /dev/null +++ b/game/player/PlayerEndScript.cpp @@ -0,0 +1,60 @@ +#include "PlayerEndScript.h" + +#include +#include +#include +#include +#include + +using namespace crepe; +using namespace std; + +void PlayerEndScript::init() { + BoxCollider jetpack_coll = this->get_components_by_name("player").back(); + CircleCollider head_coll = this->get_components_by_name("player").back(); + jetpack_coll.active = false; + head_coll.active = false; +} + +void PlayerEndScript::fixed_update(crepe::duration_t dt) { + Transform & transform_player = this->get_components_by_name("player").front(); + RefVector anim_player = this->get_components_by_name("player"); + Rigidbody & rb_player = this->get_components_by_name("player").front(); + Rigidbody & rb_camera = this->get_components_by_name("camera").front(); + + if (transform_player.position.y >= 194) { + if (jump == 0 || jump == 1) { + int random_number = rand() % 4; + for (Animator & anim : anim_player) { + anim.active = false; + anim.set_anim(6); + for (int i = 0; i < random_number; i++) { + anim.next_anim(); + } + } + } else if (jump == 2) { + for (Animator & anim : anim_player) { + anim.active = false; + anim.set_anim(7); + } + rb_player.data.angular_velocity = 0; + transform_player.rotation = 90; + } + if (jump == 0) { + rb_player.data.linear_velocity = vec2(100, -150); + rb_player.data.angular_velocity = 320; + rb_player.data.angular_velocity_coefficient = 0.8; + jump++; + } else if (jump == 1) { + rb_player.data.linear_velocity = vec2(100, -125); + rb_player.data.angular_velocity = 300; + rb_player.data.angular_velocity_coefficient = 0.8; + jump++; + } else if (jump == 2) { + rb_player.data.linear_velocity = vec2(100, 0); + rb_player.data.linear_velocity_coefficient = vec2(0.5, 0.5); + rb_camera.data.linear_velocity_coefficient = vec2(0.5, 0.5); + jump++; + } + } +} diff --git a/game/player/PlayerEndScript.h b/game/player/PlayerEndScript.h new file mode 100644 index 0000000..240ab7c --- /dev/null +++ b/game/player/PlayerEndScript.h @@ -0,0 +1,12 @@ +#pragma once + +#include + +class PlayerEndScript : public crepe::Script { +public: + void init(); + void fixed_update(crepe::duration_t dt); + +private: + int jump = 0; +}; diff --git a/game/player/PlayerScript.cpp b/game/player/PlayerScript.cpp index de53fc7..7f5d0c4 100644 --- a/game/player/PlayerScript.cpp +++ b/game/player/PlayerScript.cpp @@ -18,8 +18,7 @@ void PlayerScript::init() { bool PlayerScript::on_collision(const CollisionEvent & ev) { BehaviorScript & play_scr = this->get_components_by_name("player").front(); - BehaviorScript & end_scr - = this->get_components_by_name("end_game_script").front(); + BehaviorScript & end_scr = this->get_components_by_name("player").back(); RefVector animators = this->get_components_by_name("player"); RefVector emitters = this->get_components_by_name("player"); diff --git a/game/player/PlayerSubScene.cpp b/game/player/PlayerSubScene.cpp index 812d99a..91ae882 100644 --- a/game/player/PlayerSubScene.cpp +++ b/game/player/PlayerSubScene.cpp @@ -1,4 +1,5 @@ #include "PlayerSubScene.h" +#include "PlayerEndScript.h" #include "PlayerScript.h" #include "../Config.h" @@ -148,4 +149,5 @@ PlayerSubScene::PlayerSubScene(Scene & scn) { .collision_layer = COLL_LAY_PLAYER, }); player.add_component().set_script().active = false; + player.add_component().set_script().active = false; } -- cgit v1.2.3 From 493f7bd2f8f74a418fb06ddbd419e5d010ec5808 Mon Sep 17 00:00:00 2001 From: Max-001 Date: Tue, 24 Dec 2024 17:28:10 +0100 Subject: Re-implemented player end --- game/player/PlayerEndScript.cpp | 52 +++++++++++++++++++++-------------------- game/player/PlayerEndScript.h | 4 +++- 2 files changed, 30 insertions(+), 26 deletions(-) diff --git a/game/player/PlayerEndScript.cpp b/game/player/PlayerEndScript.cpp index c0b4e74..37b870c 100644 --- a/game/player/PlayerEndScript.cpp +++ b/game/player/PlayerEndScript.cpp @@ -10,19 +10,22 @@ using namespace crepe; using namespace std; void PlayerEndScript::init() { - BoxCollider jetpack_coll = this->get_components_by_name("player").back(); - CircleCollider head_coll = this->get_components_by_name("player").back(); - jetpack_coll.active = false; - head_coll.active = false; + Rigidbody & rb_player = this->get_components_by_name("player").front(); + rb_player.data.elasticity_coefficient = 0.7; + + subscribe([this](const CollisionEvent & ev) -> bool { + return this->on_collision(ev); + }); } -void PlayerEndScript::fixed_update(crepe::duration_t dt) { - Transform & transform_player = this->get_components_by_name("player").front(); - RefVector anim_player = this->get_components_by_name("player"); - Rigidbody & rb_player = this->get_components_by_name("player").front(); - Rigidbody & rb_camera = this->get_components_by_name("camera").front(); +bool PlayerEndScript::on_collision(const crepe::CollisionEvent & ev) { + if (ev.info.other.metadata.name == "floor") { + Transform & transform_player + = this->get_components_by_name("player").front(); + RefVector anim_player = this->get_components_by_name("player"); + Rigidbody & rb_player = this->get_components_by_name("player").front(); + Rigidbody & rb_camera = this->get_components_by_name("camera").front(); - if (transform_player.position.y >= 194) { if (jump == 0 || jump == 1) { int random_number = rand() % 4; for (Animator & anim : anim_player) { @@ -32,29 +35,28 @@ void PlayerEndScript::fixed_update(crepe::duration_t dt) { anim.next_anim(); } } - } else if (jump == 2) { - for (Animator & anim : anim_player) { - anim.active = false; - anim.set_anim(7); - } - rb_player.data.angular_velocity = 0; - transform_player.rotation = 90; } + if (jump == 0) { - rb_player.data.linear_velocity = vec2(100, -150); rb_player.data.angular_velocity = 320; - rb_player.data.angular_velocity_coefficient = 0.8; + rb_player.data.angular_velocity_coefficient = 0.7; jump++; - } else if (jump == 1) { - rb_player.data.linear_velocity = vec2(100, -125); - rb_player.data.angular_velocity = 300; - rb_player.data.angular_velocity_coefficient = 0.8; - jump++; - } else if (jump == 2) { + } else if (jump == 1 && transform_player.rotation > 65 + && transform_player.rotation < 115) { + rb_player.data.angular_velocity = 0; + rb_player.data.elasticity_coefficient = 0; rb_player.data.linear_velocity = vec2(100, 0); rb_player.data.linear_velocity_coefficient = vec2(0.5, 0.5); rb_camera.data.linear_velocity_coefficient = vec2(0.5, 0.5); + for (Animator & anim : anim_player) { + anim.active = false; + anim.set_anim(7); + } jump++; } + + return true; } + + return false; } diff --git a/game/player/PlayerEndScript.h b/game/player/PlayerEndScript.h index 240ab7c..03ea8a9 100644 --- a/game/player/PlayerEndScript.h +++ b/game/player/PlayerEndScript.h @@ -5,7 +5,9 @@ class PlayerEndScript : public crepe::Script { public: void init(); - void fixed_update(crepe::duration_t dt); + +private: + bool on_collision(const crepe::CollisionEvent & ev); private: int jump = 0; -- cgit v1.2.3 From bc66ba7754dec9d6f907bc69730f211ae2215906 Mon Sep 17 00:00:00 2001 From: Max-001 Date: Sun, 29 Dec 2024 12:15:10 +0100 Subject: Improved stop sprite --- game/player/PlayerEndScript.cpp | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/game/player/PlayerEndScript.cpp b/game/player/PlayerEndScript.cpp index 37b870c..80d3011 100644 --- a/game/player/PlayerEndScript.cpp +++ b/game/player/PlayerEndScript.cpp @@ -26,7 +26,7 @@ bool PlayerEndScript::on_collision(const crepe::CollisionEvent & ev) { Rigidbody & rb_player = this->get_components_by_name("player").front(); Rigidbody & rb_camera = this->get_components_by_name("camera").front(); - if (jump == 0 || jump == 1) { + if (jump == 0) { int random_number = rand() % 4; for (Animator & anim : anim_player) { anim.active = false; @@ -35,14 +35,19 @@ bool PlayerEndScript::on_collision(const crepe::CollisionEvent & ev) { anim.next_anim(); } } + } else if (jump == 1) { + for (Animator & anim : anim_player) { + anim.next_anim(); + } } if (jump == 0) { rb_player.data.angular_velocity = 320; rb_player.data.angular_velocity_coefficient = 0.7; jump++; - } else if (jump == 1 && transform_player.rotation > 65 - && transform_player.rotation < 115) { + } else if (jump == 1) { + jump++; + } else if (jump == 2) { rb_player.data.angular_velocity = 0; rb_player.data.elasticity_coefficient = 0; rb_player.data.linear_velocity = vec2(100, 0); @@ -52,6 +57,24 @@ bool PlayerEndScript::on_collision(const crepe::CollisionEvent & ev) { anim.active = false; anim.set_anim(7); } + if (transform_player.rotation > 0 && transform_player.rotation < 90) { + // Do not call next_anim() + } else if (transform_player.rotation > 90 && transform_player.rotation < 180) { + for (Animator & anim : anim_player) { + anim.next_anim(); + } + } else if (transform_player.rotation > 180 && transform_player.rotation < 270) { + for (Animator & anim : anim_player) { + anim.next_anim(); + anim.next_anim(); + } + } else { + for (Animator & anim : anim_player) { + anim.next_anim(); + anim.next_anim(); + anim.next_anim(); + } + } jump++; } -- cgit v1.2.3 From e7cebc43f567b0fa1701d953a9f25d5f527e89bb Mon Sep 17 00:00:00 2001 From: Max-001 Date: Sun, 29 Dec 2024 12:29:40 +0100 Subject: Added Player params to Config --- game/Config.h | 3 +++ game/StartGameScript.cpp | 3 ++- game/player/PlayerEndScript.cpp | 4 +++- game/player/PlayerScript.cpp | 5 +++-- game/player/PlayerSubScene.cpp | 4 ++-- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/game/Config.h b/game/Config.h index 796ad6c..973944e 100644 --- a/game/Config.h +++ b/game/Config.h @@ -22,3 +22,6 @@ static constexpr int GAME_HEIGHT = 800; // In game units static constexpr int VIEWPORT_X = 1100; // In game units // 'GAME_HEIGHT' (below) should be replaced by '500' when game development is finished static constexpr int VIEWPORT_Y = GAME_HEIGHT; // In game units + +static constexpr int PLAYER_SPEED = 100; // In game units +static constexpr int PLAYER_GRAVITY_SCALE = 40; // In game units diff --git a/game/StartGameScript.cpp b/game/StartGameScript.cpp index 50ba86c..72bdcd5 100644 --- a/game/StartGameScript.cpp +++ b/game/StartGameScript.cpp @@ -1,4 +1,5 @@ #include "StartGameScript.h" +#include "Config.h" #include #include @@ -50,7 +51,7 @@ void StartGameScript::fixed_update(crepe::duration_t dt) { // Start camera movement, enable player jumping and disable this script if (player_transform.position.x > 500) { Rigidbody & rb = this->get_components_by_name("camera").front(); - rb.data.linear_velocity = vec2(100, 0); + rb.data.linear_velocity = vec2(PLAYER_SPEED, 0); BehaviorScript & player_script = this->get_components_by_name("player").front(); player_script.active = true; diff --git a/game/player/PlayerEndScript.cpp b/game/player/PlayerEndScript.cpp index 80d3011..8833c28 100644 --- a/game/player/PlayerEndScript.cpp +++ b/game/player/PlayerEndScript.cpp @@ -1,5 +1,7 @@ #include "PlayerEndScript.h" +#include "../Config.h" + #include #include #include @@ -50,7 +52,7 @@ bool PlayerEndScript::on_collision(const crepe::CollisionEvent & ev) { } else if (jump == 2) { rb_player.data.angular_velocity = 0; rb_player.data.elasticity_coefficient = 0; - rb_player.data.linear_velocity = vec2(100, 0); + rb_player.data.linear_velocity = vec2(PLAYER_SPEED, 0); rb_player.data.linear_velocity_coefficient = vec2(0.5, 0.5); rb_camera.data.linear_velocity_coefficient = vec2(0.5, 0.5); for (Animator & anim : anim_player) { diff --git a/game/player/PlayerScript.cpp b/game/player/PlayerScript.cpp index 7f5d0c4..3b4cc5e 100644 --- a/game/player/PlayerScript.cpp +++ b/game/player/PlayerScript.cpp @@ -1,5 +1,6 @@ #include "PlayerScript.h" -#include "api/BehaviorScript.h" + +#include "../Config.h" #include #include @@ -79,7 +80,7 @@ void PlayerScript::fixed_update(crepe::duration_t dt) { Rigidbody & rb = this->get_components_by_name("player").front(); if (this->get_key_state(Keycode::SPACE)) { - rb.add_force_linear(vec2(0, -10)); + rb.add_force_linear(vec2(0, -PLAYER_GRAVITY_SCALE / 3)); if (prev_anim != 1) { for (Animator & anim : animators) { anim.active = true; diff --git a/game/player/PlayerSubScene.cpp b/game/player/PlayerSubScene.cpp index 91ae882..7e78e82 100644 --- a/game/player/PlayerSubScene.cpp +++ b/game/player/PlayerSubScene.cpp @@ -141,9 +141,9 @@ PlayerSubScene::PlayerSubScene(Scene & scn) { ); player.add_component(vec2(40, 60), vec2(-20, 0)); player.add_component(Rigidbody::Data { - .gravity_scale = 20, + .gravity_scale = PLAYER_GRAVITY_SCALE, .body_type = Rigidbody::BodyType::DYNAMIC, - .linear_velocity = vec2(100, 0), + .linear_velocity = vec2(PLAYER_SPEED, 0), .collision_layers = {COLL_LAY_BOT_TOP, COLL_LAY_ZAPPER, COLL_LAY_LASER, COLL_LAY_MISSILE}, .collision_layer = COLL_LAY_PLAYER, -- cgit v1.2.3 From f693119c9e102a9b51a1015168ee2a56f2309dd1 Mon Sep 17 00:00:00 2001 From: heavydemon21 Date: Sun, 5 Jan 2025 16:44:25 +0100 Subject: fixed AnimatorSystem bug so that it takes delta time instead of elapsed time, the Animator api has not been changed --- src/crepe/api/Animator.h | 7 +++++++ src/crepe/system/AnimatorSystem.cpp | 23 +++++++++++++++-------- src/example/rendering_particle.cpp | 35 ++++++----------------------------- 3 files changed, 28 insertions(+), 37 deletions(-) diff --git a/src/crepe/api/Animator.h b/src/crepe/api/Animator.h index 102894d..efc2f6e 100644 --- a/src/crepe/api/Animator.h +++ b/src/crepe/api/Animator.h @@ -1,6 +1,7 @@ #pragma once #include "../types.h" +#include "../manager/LoopTimerManager.h" #include "Component.h" #include "Sprite.h" @@ -99,6 +100,12 @@ private: //! The maximum number of rows and columns inside the spritesheet const uvec2 grid_size; + // the time elapsed from a frame duration + duration_t elapsed_time = {}; + + // frame counter + unsigned int frame = 0; + //! Uses the spritesheet friend AnimatorSystem; }; diff --git a/src/crepe/system/AnimatorSystem.cpp b/src/crepe/system/AnimatorSystem.cpp index e5ab2fa..1a0cde9 100644 --- a/src/crepe/system/AnimatorSystem.cpp +++ b/src/crepe/system/AnimatorSystem.cpp @@ -1,7 +1,8 @@ +#include + #include "../api/Animator.h" #include "../manager/ComponentManager.h" #include "../manager/LoopTimerManager.h" -#include #include "AnimatorSystem.h" @@ -13,27 +14,33 @@ void AnimatorSystem::frame_update() { LoopTimerManager & timer = this->mediator.loop_timer; RefVector animations = mgr.get_components_by_type(); - float elapsed_time = duration_cast>(timer.get_elapsed_time()).count(); + duration_t elapsed_time = timer.get_delta_time(); for (Animator & a : animations) { if (!a.active) continue; if (a.data.fps == 0) continue; Animator::Data & ctx = a.data; - float frame_duration = 1.0f / ctx.fps; - int last_frame = ctx.row; + a.elapsed_time += elapsed_time; + duration_t frame_duration = 1000ms / ctx.fps; + + if (a.elapsed_time <= frame_duration) continue; + + a.elapsed_time = 0ms; + a.frame++; int cycle_end = (ctx.cycle_end == -1) ? a.grid_size.x : ctx.cycle_end; int total_frames = cycle_end - ctx.cycle_start; + int curr_cycle_frame = (a.frame - ctx.cycle_start) % total_frames; - int curr_frame = static_cast(elapsed_time / frame_duration) % total_frames; + ctx.row = (ctx.cycle_start + curr_cycle_frame) % a.grid_size.x; + ctx.col = curr_cycle_frame / a.grid_size.x; - ctx.row = ctx.cycle_start + curr_frame; a.spritesheet.mask.x = ctx.row * a.spritesheet.mask.w; - a.spritesheet.mask.y = (ctx.col * a.spritesheet.mask.h); + a.spritesheet.mask.y = ctx.col * a.spritesheet.mask.y; - if (!ctx.looping && curr_frame == ctx.cycle_start && last_frame == total_frames - 1) { + if (!ctx.looping && a.frame >= cycle_end) { a.active = false; } } diff --git a/src/example/rendering_particle.cpp b/src/example/rendering_particle.cpp index 8be781a..0082b91 100644 --- a/src/example/rendering_particle.cpp +++ b/src/example/rendering_particle.cpp @@ -27,7 +27,7 @@ public: Color color(255, 255, 255, 255); - Asset img {"asset/texture/square.png"}; + Asset img {"asset/spritesheet/pokemon_spritesheet.png"}; Sprite & test_sprite = game_object.add_component( img, @@ -36,21 +36,17 @@ public: .flip = Sprite::FlipSettings {false, false}, .sorting_in_layer = 2, .order_in_layer = 2, - .size = {1, 1}, + .size = {1, 0}, .angle_offset = 0, .position_offset = {0, 1}, .world_space = false, } ); - //auto & emitter = game_object.add_component(test_sprite, ParticleEmitter::Data{}); - Sprite & test_sprite1 = game_object.add_component( - img, - Sprite::Data { - .color = color, - .size = {1, 1}, - .position_offset = {0, -1}, - .world_space = false, + game_object.add_component( + test_sprite, ivec2 {56, 56}, uvec2 {4, 4}, + Animator::Data { + .looping = true, } ); @@ -61,25 +57,6 @@ public: .postion_offset = {1000, 1000}, } ); - - game_object.add_component( - vec2 {1, 1}, vec2 {0, -1}, "ComicSansMS", - Text::Data { - .text_color = Color::RED, - }, - "test TEST" - ); - - game_object - .add_component( - vec2 {1, 1}, vec2 {0, 1}, "Ariel", - Text::Data { - .text_color = Color::BLACK, - }, - "TEST test" - ) - .world_space - = true; } string get_name() const { return "TestScene"; }; -- cgit v1.2.3 From a4576c3bab0901074c53209c141b2a767c60d38a Mon Sep 17 00:00:00 2001 From: Max-001 Date: Mon, 6 Jan 2025 09:56:37 +0100 Subject: Improved Player speed and velocity --- game/Config.h | 4 ++-- game/player/PlayerScript.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/game/Config.h b/game/Config.h index 973944e..1e51141 100644 --- a/game/Config.h +++ b/game/Config.h @@ -23,5 +23,5 @@ static constexpr int VIEWPORT_X = 1100; // In game units // 'GAME_HEIGHT' (below) should be replaced by '500' when game development is finished static constexpr int VIEWPORT_Y = GAME_HEIGHT; // In game units -static constexpr int PLAYER_SPEED = 100; // In game units -static constexpr int PLAYER_GRAVITY_SCALE = 40; // In game units +static constexpr int PLAYER_SPEED = 150; // In game units +static constexpr int PLAYER_GRAVITY_SCALE = 60; // In game units diff --git a/game/player/PlayerScript.cpp b/game/player/PlayerScript.cpp index 3b4cc5e..c4ed6a0 100644 --- a/game/player/PlayerScript.cpp +++ b/game/player/PlayerScript.cpp @@ -80,7 +80,7 @@ void PlayerScript::fixed_update(crepe::duration_t dt) { Rigidbody & rb = this->get_components_by_name("player").front(); if (this->get_key_state(Keycode::SPACE)) { - rb.add_force_linear(vec2(0, -PLAYER_GRAVITY_SCALE / 3)); + rb.add_force_linear(vec2(0, -PLAYER_GRAVITY_SCALE / 2.5)); if (prev_anim != 1) { for (Animator & anim : animators) { anim.active = true; -- cgit v1.2.3 From b31934cc6867be10e986a4bd4d0ab81dc91d56ec Mon Sep 17 00:00:00 2001 From: Max-001 Date: Mon, 6 Jan 2025 10:14:58 +0100 Subject: Paralax stops when player stops --- game/GameScene.cpp | 2 +- game/player/PlayerEndScript.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/game/GameScene.cpp b/game/GameScene.cpp index 821191d..a8fcb47 100644 --- a/game/GameScene.cpp +++ b/game/GameScene.cpp @@ -100,7 +100,7 @@ void GameScene::load_scene() { .collision_layer = COLL_LAY_LASER, }); laser.add_component(vec2(100, 100)); - GameObject missile = new_object("missile", "missile", vec2(3000, 0)); + GameObject missile = new_object("missile", "missile", vec2(4000, 0)); Asset missile_asset {"asset/obstacles/missile/missile.png"}; Sprite & missile_sprite = missile.add_component( missile_asset, diff --git a/game/player/PlayerEndScript.cpp b/game/player/PlayerEndScript.cpp index 8833c28..4cd2cd0 100644 --- a/game/player/PlayerEndScript.cpp +++ b/game/player/PlayerEndScript.cpp @@ -50,6 +50,12 @@ bool PlayerEndScript::on_collision(const crepe::CollisionEvent & ev) { } else if (jump == 1) { jump++; } else if (jump == 2) { + RefVector rb_back_forest + = this->get_components_by_tag("forest_background"); + for (Rigidbody & rb : rb_back_forest) { + rb.data.linear_velocity_coefficient = vec2(0.5, 0.5); + } + rb_player.data.angular_velocity = 0; rb_player.data.elasticity_coefficient = 0; rb_player.data.linear_velocity = vec2(PLAYER_SPEED, 0); -- cgit v1.2.3 From 92dfde9a56f5a607269e8908002a72bec85357bd Mon Sep 17 00:00:00 2001 From: WBoerenkamps Date: Mon, 6 Jan 2025 10:50:01 +0100 Subject: bug fix --- src/crepe/system/InputSystem.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/crepe/system/InputSystem.cpp b/src/crepe/system/InputSystem.cpp index 91c9c64..d9c97a3 100644 --- a/src/crepe/system/InputSystem.cpp +++ b/src/crepe/system/InputSystem.cpp @@ -216,8 +216,8 @@ bool InputSystem::is_mouse_inside_button( if (!button.data.world_space) { actual_pos += cam_transform.position; } - vec2 half_dimensions = button.dimensions / 2; - + vec2 half_dimensions = button.dimensions * transform.scale / 2; + return mouse_pos.x >= actual_pos.x - half_dimensions.x && mouse_pos.x <= actual_pos.x + half_dimensions.x && mouse_pos.y >= actual_pos.y - half_dimensions.y -- cgit v1.2.3 From cc2ffe577ad93b126bf9cac6391e678eb54a07f5 Mon Sep 17 00:00:00 2001 From: WBoerenkamps Date: Mon, 6 Jan 2025 10:52:47 +0100 Subject: make format --- src/crepe/system/InputSystem.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/crepe/system/InputSystem.cpp b/src/crepe/system/InputSystem.cpp index d9c97a3..be7eda6 100644 --- a/src/crepe/system/InputSystem.cpp +++ b/src/crepe/system/InputSystem.cpp @@ -217,7 +217,7 @@ bool InputSystem::is_mouse_inside_button( actual_pos += cam_transform.position; } vec2 half_dimensions = button.dimensions * transform.scale / 2; - + return mouse_pos.x >= actual_pos.x - half_dimensions.x && mouse_pos.x <= actual_pos.x + half_dimensions.x && mouse_pos.y >= actual_pos.y - half_dimensions.y -- cgit v1.2.3 From 20ae1e9dc2043ef3c190f77dd5f9de74bcd533de Mon Sep 17 00:00:00 2001 From: Max-001 Date: Mon, 6 Jan 2025 11:11:25 +0100 Subject: Added dt --- game/Config.h | 2 +- game/StartGameScript.cpp | 2 +- game/player/PlayerEndScript.cpp | 7 +++++-- game/player/PlayerSubScene.cpp | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/game/Config.h b/game/Config.h index 1e51141..d6f8349 100644 --- a/game/Config.h +++ b/game/Config.h @@ -23,5 +23,5 @@ static constexpr int VIEWPORT_X = 1100; // In game units // 'GAME_HEIGHT' (below) should be replaced by '500' when game development is finished static constexpr int VIEWPORT_Y = GAME_HEIGHT; // In game units -static constexpr int PLAYER_SPEED = 150; // In game units +static constexpr int PLAYER_SPEED = 7500; // In game units static constexpr int PLAYER_GRAVITY_SCALE = 60; // In game units diff --git a/game/StartGameScript.cpp b/game/StartGameScript.cpp index 72bdcd5..c786eb4 100644 --- a/game/StartGameScript.cpp +++ b/game/StartGameScript.cpp @@ -51,7 +51,7 @@ void StartGameScript::fixed_update(crepe::duration_t dt) { // Start camera movement, enable player jumping and disable this script if (player_transform.position.x > 500) { Rigidbody & rb = this->get_components_by_name("camera").front(); - rb.data.linear_velocity = vec2(PLAYER_SPEED, 0); + rb.data.linear_velocity = vec2(PLAYER_SPEED * dt.count(), 0); BehaviorScript & player_script = this->get_components_by_name("player").front(); player_script.active = true; diff --git a/game/player/PlayerEndScript.cpp b/game/player/PlayerEndScript.cpp index 4cd2cd0..e04fb9d 100644 --- a/game/player/PlayerEndScript.cpp +++ b/game/player/PlayerEndScript.cpp @@ -1,6 +1,7 @@ #include "PlayerEndScript.h" #include "../Config.h" +#include "manager/LoopTimerManager.h" #include #include @@ -28,6 +29,8 @@ bool PlayerEndScript::on_collision(const crepe::CollisionEvent & ev) { Rigidbody & rb_player = this->get_components_by_name("player").front(); Rigidbody & rb_camera = this->get_components_by_name("camera").front(); + float dt = this->get_loop_timer().get_fixed_delta_time().count(); + if (jump == 0) { int random_number = rand() % 4; for (Animator & anim : anim_player) { @@ -44,7 +47,7 @@ bool PlayerEndScript::on_collision(const crepe::CollisionEvent & ev) { } if (jump == 0) { - rb_player.data.angular_velocity = 320; + rb_player.data.angular_velocity = 16000 * dt; rb_player.data.angular_velocity_coefficient = 0.7; jump++; } else if (jump == 1) { @@ -58,7 +61,7 @@ bool PlayerEndScript::on_collision(const crepe::CollisionEvent & ev) { rb_player.data.angular_velocity = 0; rb_player.data.elasticity_coefficient = 0; - rb_player.data.linear_velocity = vec2(PLAYER_SPEED, 0); + rb_player.data.linear_velocity = vec2(PLAYER_SPEED * dt, 0); rb_player.data.linear_velocity_coefficient = vec2(0.5, 0.5); rb_camera.data.linear_velocity_coefficient = vec2(0.5, 0.5); for (Animator & anim : anim_player) { diff --git a/game/player/PlayerSubScene.cpp b/game/player/PlayerSubScene.cpp index 7e78e82..c1e5e2f 100644 --- a/game/player/PlayerSubScene.cpp +++ b/game/player/PlayerSubScene.cpp @@ -143,7 +143,7 @@ PlayerSubScene::PlayerSubScene(Scene & scn) { player.add_component(Rigidbody::Data { .gravity_scale = PLAYER_GRAVITY_SCALE, .body_type = Rigidbody::BodyType::DYNAMIC, - .linear_velocity = vec2(PLAYER_SPEED, 0), + .linear_velocity = vec2(PLAYER_SPEED * 0.02, 0), .collision_layers = {COLL_LAY_BOT_TOP, COLL_LAY_ZAPPER, COLL_LAY_LASER, COLL_LAY_MISSILE}, .collision_layer = COLL_LAY_PLAYER, -- cgit v1.2.3 From 958475050c80addf584b6a166649c337c68a879f Mon Sep 17 00:00:00 2001 From: heavydemon21 Date: Mon, 6 Jan 2025 11:26:23 +0100 Subject: make format with small adjustment system --- src/crepe/api/Animator.h | 2 +- src/crepe/system/AnimatorSystem.cpp | 9 +++++---- src/example/rendering_particle.cpp | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/crepe/api/Animator.h b/src/crepe/api/Animator.h index efc2f6e..95539d3 100644 --- a/src/crepe/api/Animator.h +++ b/src/crepe/api/Animator.h @@ -1,7 +1,7 @@ #pragma once -#include "../types.h" #include "../manager/LoopTimerManager.h" +#include "../types.h" #include "Component.h" #include "Sprite.h" diff --git a/src/crepe/system/AnimatorSystem.cpp b/src/crepe/system/AnimatorSystem.cpp index 1a0cde9..ec9a445 100644 --- a/src/crepe/system/AnimatorSystem.cpp +++ b/src/crepe/system/AnimatorSystem.cpp @@ -34,14 +34,15 @@ void AnimatorSystem::frame_update() { int total_frames = cycle_end - ctx.cycle_start; int curr_cycle_frame = (a.frame - ctx.cycle_start) % total_frames; + if (!ctx.looping && a.frame >= cycle_end) { + a.active = false; + continue; + } + ctx.row = (ctx.cycle_start + curr_cycle_frame) % a.grid_size.x; ctx.col = curr_cycle_frame / a.grid_size.x; a.spritesheet.mask.x = ctx.row * a.spritesheet.mask.w; a.spritesheet.mask.y = ctx.col * a.spritesheet.mask.y; - - if (!ctx.looping && a.frame >= cycle_end) { - a.active = false; - } } } diff --git a/src/example/rendering_particle.cpp b/src/example/rendering_particle.cpp index 0082b91..c28d6a0 100644 --- a/src/example/rendering_particle.cpp +++ b/src/example/rendering_particle.cpp @@ -46,7 +46,7 @@ public: game_object.add_component( test_sprite, ivec2 {56, 56}, uvec2 {4, 4}, Animator::Data { - .looping = true, + .looping = false, } ); -- cgit v1.2.3 From 1880d3bd97524455b72a29603b45de2da8de3f31 Mon Sep 17 00:00:00 2001 From: heavydemon21 Date: Mon, 6 Jan 2025 12:05:51 +0100 Subject: hotfix used a.col which is not permitted --- src/crepe/system/AnimatorSystem.cpp | 13 ++++++------- src/example/rendering_particle.cpp | 8 ++++++-- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/crepe/system/AnimatorSystem.cpp b/src/crepe/system/AnimatorSystem.cpp index ec9a445..1a30502 100644 --- a/src/crepe/system/AnimatorSystem.cpp +++ b/src/crepe/system/AnimatorSystem.cpp @@ -25,23 +25,22 @@ void AnimatorSystem::frame_update() { a.elapsed_time += elapsed_time; duration_t frame_duration = 1000ms / ctx.fps; - if (a.elapsed_time <= frame_duration) continue; - - a.elapsed_time = 0ms; - a.frame++; - int cycle_end = (ctx.cycle_end == -1) ? a.grid_size.x : ctx.cycle_end; int total_frames = cycle_end - ctx.cycle_start; int curr_cycle_frame = (a.frame - ctx.cycle_start) % total_frames; + if (a.elapsed_time >= frame_duration) { + a.elapsed_time = 0ms; + a.frame++; + } + if (!ctx.looping && a.frame >= cycle_end) { a.active = false; continue; } ctx.row = (ctx.cycle_start + curr_cycle_frame) % a.grid_size.x; - ctx.col = curr_cycle_frame / a.grid_size.x; - + //ctx.col = curr_cycle_frame / a.grid_size.x; a.spritesheet.mask.x = ctx.row * a.spritesheet.mask.w; a.spritesheet.mask.y = ctx.col * a.spritesheet.mask.y; } diff --git a/src/example/rendering_particle.cpp b/src/example/rendering_particle.cpp index c28d6a0..e6b31a7 100644 --- a/src/example/rendering_particle.cpp +++ b/src/example/rendering_particle.cpp @@ -43,13 +43,17 @@ public: } ); - game_object.add_component( + auto & anim = game_object.add_component( test_sprite, ivec2 {56, 56}, uvec2 {4, 4}, Animator::Data { - .looping = false, + .looping = 0, } ); + anim.set_anim(1); + anim.pause(); + anim.next_anim(); + auto & cam = game_object.add_component( ivec2 {1280, 720}, vec2 {5, 5}, Camera::Data { -- cgit v1.2.3 From db644d1cb7543faff63379ff5f1e69ea0a703f93 Mon Sep 17 00:00:00 2001 From: heavydemon21 Date: Mon, 6 Jan 2025 12:36:39 +0100 Subject: animator fix -_- --- src/crepe/system/AnimatorSystem.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/crepe/system/AnimatorSystem.cpp b/src/crepe/system/AnimatorSystem.cpp index 1a30502..759d14c 100644 --- a/src/crepe/system/AnimatorSystem.cpp +++ b/src/crepe/system/AnimatorSystem.cpp @@ -26,22 +26,22 @@ void AnimatorSystem::frame_update() { duration_t frame_duration = 1000ms / ctx.fps; int cycle_end = (ctx.cycle_end == -1) ? a.grid_size.x : ctx.cycle_end; - int total_frames = cycle_end - ctx.cycle_start; - int curr_cycle_frame = (a.frame - ctx.cycle_start) % total_frames; - if (a.elapsed_time >= frame_duration) { a.elapsed_time = 0ms; a.frame++; + if (a.frame == cycle_end) { + a.frame = ctx.cycle_start; + if (!ctx.looping) { + a.active = false; + continue; + } + } } - if (!ctx.looping && a.frame >= cycle_end) { - a.active = false; - continue; - } - ctx.row = (ctx.cycle_start + curr_cycle_frame) % a.grid_size.x; - //ctx.col = curr_cycle_frame / a.grid_size.x; + ctx.row = ctx.cycle_start + a.frame; a.spritesheet.mask.x = ctx.row * a.spritesheet.mask.w; - a.spritesheet.mask.y = ctx.col * a.spritesheet.mask.y; + //a.spritesheet.mask.y = ctx.col * a.spritesheet.mask.y; + } } -- cgit v1.2.3 From 58542c5f986a8c96cf4313eb27c88154729fb032 Mon Sep 17 00:00:00 2001 From: Max-001 Date: Mon, 6 Jan 2025 12:37:51 +0100 Subject: Make format --- src/crepe/system/AnimatorSystem.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/crepe/system/AnimatorSystem.cpp b/src/crepe/system/AnimatorSystem.cpp index 759d14c..ac1fae2 100644 --- a/src/crepe/system/AnimatorSystem.cpp +++ b/src/crepe/system/AnimatorSystem.cpp @@ -38,10 +38,8 @@ void AnimatorSystem::frame_update() { } } - ctx.row = ctx.cycle_start + a.frame; a.spritesheet.mask.x = ctx.row * a.spritesheet.mask.w; //a.spritesheet.mask.y = ctx.col * a.spritesheet.mask.y; - } } -- cgit v1.2.3 From eef88cd5804e88b504d940d8256ec17798da9648 Mon Sep 17 00:00:00 2001 From: Max-001 Date: Mon, 6 Jan 2025 12:38:54 +0100 Subject: Deleted comment --- src/crepe/system/AnimatorSystem.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/crepe/system/AnimatorSystem.cpp b/src/crepe/system/AnimatorSystem.cpp index ac1fae2..143d5d6 100644 --- a/src/crepe/system/AnimatorSystem.cpp +++ b/src/crepe/system/AnimatorSystem.cpp @@ -40,6 +40,5 @@ void AnimatorSystem::frame_update() { ctx.row = ctx.cycle_start + a.frame; a.spritesheet.mask.x = ctx.row * a.spritesheet.mask.w; - //a.spritesheet.mask.y = ctx.col * a.spritesheet.mask.y; } } -- cgit v1.2.3 From 77d02bf2e2d5d04e8cacb3c783446541517e8e76 Mon Sep 17 00:00:00 2001 From: Max-001 Date: Mon, 6 Jan 2025 12:46:56 +0100 Subject: Added dt --- game/player/PlayerScript.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game/player/PlayerScript.cpp b/game/player/PlayerScript.cpp index c4ed6a0..472d7c8 100644 --- a/game/player/PlayerScript.cpp +++ b/game/player/PlayerScript.cpp @@ -80,7 +80,7 @@ void PlayerScript::fixed_update(crepe::duration_t dt) { Rigidbody & rb = this->get_components_by_name("player").front(); if (this->get_key_state(Keycode::SPACE)) { - rb.add_force_linear(vec2(0, -PLAYER_GRAVITY_SCALE / 2.5)); + rb.add_force_linear(vec2(0, -PLAYER_GRAVITY_SCALE / 2.5) * dt.count() / 0.02); if (prev_anim != 1) { for (Animator & anim : animators) { anim.active = true; -- cgit v1.2.3