From c17a1ac94186a2de6ad30e9228a031fb08434e52 Mon Sep 17 00:00:00 2001 From: heavydemon21 Date: Fri, 10 Jan 2025 19:32:25 +0100 Subject: tiny adjustments for preview scene --- game/PreviewScene.cpp | 2 +- game/preview/NpcSubScene.cpp | 2 +- game/preview/PrevPlayerScript.cpp | 18 ++++++------------ game/preview/PrevPlayerSubScene.cpp | 4 ++-- 4 files changed, 10 insertions(+), 16 deletions(-) diff --git a/game/PreviewScene.cpp b/game/PreviewScene.cpp index ae43225..1179ffc 100644 --- a/game/PreviewScene.cpp +++ b/game/PreviewScene.cpp @@ -81,7 +81,7 @@ void PreviewScene::load_scene() { GameObject world = this->new_object("world", "TAG", vec2 {0, 0}, 0, 1); world.add_component(Rigidbody::Data { .body_type = Rigidbody::BodyType::STATIC, - .collision_layer = COLL_LAY_BOT_TOP, + .collision_layer = 100, }); world.add_component(vec2(100,INFINITY), vec2(VIEWPORT_X,VIEWPORT_Y)); diff --git a/game/preview/NpcSubScene.cpp b/game/preview/NpcSubScene.cpp index a3781af..c9ab5b6 100644 --- a/game/preview/NpcSubScene.cpp +++ b/game/preview/NpcSubScene.cpp @@ -57,7 +57,7 @@ NpcSubScene::NpcSubScene(Scene & scn) { .body_type = Rigidbody::BodyType::DYNAMIC, .linear_velocity = {-50, 0}, //.max_linear_velocity = 40, - .collision_layers = {COLL_LAY_BOT_TOP, COLL_LAY_PLAYER}, + .collision_layers = {COLL_LAY_BOT_TOP, COLL_LAY_PLAYER, 100}, .collision_layer = COLL_LAY_PLAYER, }); diff --git a/game/preview/PrevPlayerScript.cpp b/game/preview/PrevPlayerScript.cpp index 2657b8d..3e6eed4 100644 --- a/game/preview/PrevPlayerScript.cpp +++ b/game/preview/PrevPlayerScript.cpp @@ -1,12 +1,11 @@ #include "PrevPlayerScript.h" #include "../missile/SpawnEvent.h" -#include "api/Transform.h" + +#include #include #include #include -#include -#include using namespace crepe; @@ -59,16 +58,16 @@ bool PrevPlayerScript::key_pressed(const KeyPressEvent & ev) { this->head_anim->set_anim(7); break; case Keycode::LEFT: - this->head->data.angle_offset -= 1; + this->get_component().rotation += 10; break; case Keycode::RIGHT: - this->head->data.angle_offset += 1; + this->get_component().rotation -= 10; break; case Keycode::UP: - this->head->data.scale_offset += 0.1; + this->head->data.position_offset += 10; break; case Keycode::DOWN: - this->head->data.scale_offset -= 0.1; + this->head->data.position_offset -= 10; break; case Keycode::P: this->get_component().play(); @@ -98,11 +97,6 @@ bool PrevPlayerScript::key_pressed(const KeyPressEvent & ev) { case Keycode::M: trigger_event(MissileSpawnEvent {}); break; - //todo - case Keycode::PAGE_UP: - case Keycode::PAGE_DOWN: - case Keycode::HOME: - break; default: break; } diff --git a/game/preview/PrevPlayerSubScene.cpp b/game/preview/PrevPlayerSubScene.cpp index 4351deb..3f5a5d5 100644 --- a/game/preview/PrevPlayerSubScene.cpp +++ b/game/preview/PrevPlayerSubScene.cpp @@ -71,10 +71,10 @@ PrevPlayerSubScene::PrevPlayerSubScene(Scene & scn) { } ); player.add_component(Rigidbody::Data { - .gravity_scale = 20, + .gravity_scale = 1, .body_type = Rigidbody::BodyType::DYNAMIC, .linear_velocity = vec2(100, 0), - .collision_layers = {COLL_LAY_BOT_TOP}, + .collision_layers = {COLL_LAY_BOT_TOP, 100}, .collision_layer = COLL_LAY_PLAYER, }); player.add_component(vec2(50, 50)); -- cgit v1.2.3