From a600cc55468a6513743ce916aa3da129270c23f0 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Sun, 22 Dec 2024 20:04:33 +0100 Subject: more WIP zapper --- game/GameScene.cpp | 5 ++- game/StartGameScript.cpp | 2 +- game/background/HallwaySubScene.cpp | 7 +--- game/prefab/CMakeLists.txt | 2 + game/prefab/ZapperObject.cpp | 84 +++++++++++++++++++++++++++++++++++++ game/prefab/ZapperObject.h | 32 +++++++++++++- game/prefab/ZapperScript.cpp | 23 ++++++++++ game/prefab/ZapperScript.h | 18 ++++++++ 8 files changed, 164 insertions(+), 9 deletions(-) create mode 100644 game/prefab/ZapperObject.cpp create mode 100644 game/prefab/ZapperScript.cpp create mode 100644 game/prefab/ZapperScript.h (limited to 'game') diff --git a/game/GameScene.cpp b/game/GameScene.cpp index 57c6531..90a8b58 100644 --- a/game/GameScene.cpp +++ b/game/GameScene.cpp @@ -21,6 +21,7 @@ #include "background/BackgroundSubScene.h" #include "prefab/PlayerObject.h" +#include "prefab/ZapperObject.h" using namespace crepe; using namespace std; @@ -40,7 +41,7 @@ void GameScene::load_scene() { camera.add_component().set_script(); camera.add_component(Rigidbody::Data {}); - PlayerObject player {new_object("player", "player", vec2(-100, 200))}; + PlayerObject {new_object("player", "player", vec2(-100, 200))}; GameObject floor = new_object("floor", "game_world", vec2(0, 325)); floor.add_component(Rigidbody::Data { @@ -66,6 +67,8 @@ void GameScene::load_scene() { }); ceiling.add_component(vec2(INFINITY, 200)); + ZapperObject {new_object("zapper", "zapper", vec2(800, 0))}; + GameObject start_game_script = new_object("start_game_script", "script", vec2(0, 0)); start_game_script.add_component().set_script(); } diff --git a/game/StartGameScript.cpp b/game/StartGameScript.cpp index 50ba86c..1196d47 100644 --- a/game/StartGameScript.cpp +++ b/game/StartGameScript.cpp @@ -40,7 +40,7 @@ void StartGameScript::fixed_update(crepe::duration_t dt) { if (player_transform.position.x > 275 && !this->took_jetpack) { Animator & jetpack_stand_anim = this->get_components_by_name("start_begin").back(); - jetpack_stand_anim.next_anim(); + // jetpack_stand_anim.next_anim(); Sprite & jetpack_sprite = this->get_components_by_name("player").back(); jetpack_sprite.active = true; diff --git a/game/background/HallwaySubScene.cpp b/game/background/HallwaySubScene.cpp index 4d96c94..9a6654a 100644 --- a/game/background/HallwaySubScene.cpp +++ b/game/background/HallwaySubScene.cpp @@ -153,11 +153,6 @@ void HallwaySubScene::add_sector_number( Animator & sector_num_anim = obj.add_component( sector_num_sprite, ivec2(256, 128), uvec2(4, 4), Animator::Data {} ); - int column = (sector_num - 1) / 4; - int row = (sector_num - 1) % 4; - sector_num_anim.set_anim(column); - for (int i = 0; i < row; i++) { - sector_num_anim.next_anim(); - } + sector_num_anim.data.frame++; sector_num_anim.pause(); } diff --git a/game/prefab/CMakeLists.txt b/game/prefab/CMakeLists.txt index a588090..03084e4 100644 --- a/game/prefab/CMakeLists.txt +++ b/game/prefab/CMakeLists.txt @@ -1,5 +1,7 @@ target_sources(main PUBLIC PlayerObject.cpp PlayerScript.cpp + ZapperObject.cpp + ZapperScript.cpp ) diff --git a/game/prefab/ZapperObject.cpp b/game/prefab/ZapperObject.cpp new file mode 100644 index 0000000..2791162 --- /dev/null +++ b/game/prefab/ZapperObject.cpp @@ -0,0 +1,84 @@ +#include "Config.h" +#include "ZapperObject.h" +#include "ZapperScript.h" + +using namespace crepe; + +ZapperObject::ZapperObject(crepe::GameObject && base) + : GameObject(std::move(base)), + sprite { + .orb_start = add_component( + Asset {"asset/obstacles/zapper/orbAnim.png"}, + Sprite::Data { + .sorting_in_layer = SORT_IN_LAY_OBSTACLES, + .order_in_layer = 1, + .size = vec2{0, 1} * SCALE, + .position_offset = {0, 100}, + } + ), + .orb_end = add_component( + sprite.orb_start.source, + Sprite::Data { + .flip = {true, true}, + .sorting_in_layer = SORT_IN_LAY_OBSTACLES, + .order_in_layer = 1, + .size = vec2{0, 1} * SCALE, + .position_offset = {0, -100}, + } + ), + .glow_start = add_component( + Asset {"asset/obstacles/zapper/regular_zappers/glow.png"}, + Sprite::Data { + .sorting_in_layer = SORT_IN_LAY_OBSTACLES, + .order_in_layer = -1, + .size = vec2{2, 2} * SCALE, + .position_offset = {0, 100}, + } + ), + .glow_end = add_component( + sprite.glow_start.source, + Sprite::Data { + .flip = {true, true}, + .sorting_in_layer = SORT_IN_LAY_OBSTACLES, + .order_in_layer = -1, + .size = vec2{2, 2} * SCALE, + .position_offset = {0, -100}, + } + ), + .beam = add_component( + Asset {"asset/obstacles/zapper/regular_zappers/zapEffect.png"}, + Sprite::Data { + .sorting_in_layer = SORT_IN_LAY_OBSTACLES, + .order_in_layer = 0, + .size = vec2{200, 50}, + .angle_offset = 90, + } + ), + }, + animator { + .orb_start = add_component( + sprite.orb_start, ivec2(62, 42), uvec2(4, 1), + Animator::Data { + .fps = 10, + .looping = true, + } + ), + .orb_end = add_component( + sprite.orb_end, ivec2(62, 42), uvec2(4, 1), + animator.orb_start.data + ), + .glow_start = add_component( + sprite.glow_start, ivec2(128, 128), uvec2(4, 4), + Animator::Data { + .fps = 30, + .looping = true, + } + ), + .glow_end = add_component( + sprite.glow_end, ivec2(128, 128), uvec2(4, 4), + animator.glow_start.data + ), + }, + controller(add_component().set_script(*this)) +{ } + diff --git a/game/prefab/ZapperObject.h b/game/prefab/ZapperObject.h index 1f32cd7..6b68146 100644 --- a/game/prefab/ZapperObject.h +++ b/game/prefab/ZapperObject.h @@ -1,7 +1,37 @@ #pragma once +#include +#include +#include #include +#include +#include class ZapperObject : public crepe::GameObject { - // afsd +public: + ZapperObject(crepe::GameObject &&); + +public: + struct { + crepe::Sprite & orb_start; + crepe::Sprite & orb_end; + crepe::Sprite & glow_start; + crepe::Sprite & glow_end; + crepe::Sprite & beam; + } sprite; + + struct { + crepe::Animator & orb_start; + crepe::Animator & orb_end; + crepe::Animator & glow_start; + crepe::Animator & glow_end; + } animator; + + // crepe::Rigidbody & body; + // crepe::BoxCollider & collider; + crepe::BehaviorScript & controller; + +private: + static constexpr int SCALE = 60; }; + diff --git a/game/prefab/ZapperScript.cpp b/game/prefab/ZapperScript.cpp new file mode 100644 index 0000000..b9b24be --- /dev/null +++ b/game/prefab/ZapperScript.cpp @@ -0,0 +1,23 @@ +#include +#include + +#include "ZapperScript.h" + +using namespace crepe; +using namespace std; + +ZapperScript::ZapperScript(const ZapperObject & zapper) : zapper(zapper) { } + +void ZapperScript::init() { + zapper.sprite.beam.mask = { + .w = 350, + .h = 117, + .x = 0, + .y = 0, + }; +} + +void ZapperScript::frame_update(duration_t delta_time) { + zapper.sprite.beam.mask.x += 4; +} + diff --git a/game/prefab/ZapperScript.h b/game/prefab/ZapperScript.h new file mode 100644 index 0000000..5a960df --- /dev/null +++ b/game/prefab/ZapperScript.h @@ -0,0 +1,18 @@ +#pragma once + +#include + +#include "ZapperObject.h" + +class ZapperScript : public crepe::Script { +public: + ZapperScript(const ZapperObject & zapper); + +protected: + void init(); + void frame_update(crepe::duration_t delta_time); + +protected: + ZapperObject zapper; +}; + -- cgit v1.2.3