From 3c0fa9d60259220a2aa7cd23c312a10476270d80 Mon Sep 17 00:00:00 2001 From: Dominic Masters Date: Wed, 1 Feb 2023 07:26:55 -0800 Subject: [PATCH] Script first pass --- .../events/characters/VisualNovelTransformItemEvent.cpp | 7 +++++-- src/dawnpokergame/scenes/Scene_1.hpp | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/dawn/visualnovel/events/characters/VisualNovelTransformItemEvent.cpp b/src/dawn/visualnovel/events/characters/VisualNovelTransformItemEvent.cpp index 877201e0..d122ea1d 100644 --- a/src/dawn/visualnovel/events/characters/VisualNovelTransformItemEvent.cpp +++ b/src/dawn/visualnovel/events/characters/VisualNovelTransformItemEvent.cpp @@ -21,7 +21,9 @@ VisualNovelTransformItemEvent::VisualNovelTransformItemEvent( this->callbackAnimation.setCallback( &item->transform, &Transform::setLocalPosition ); - this->callbackAnimation.addKeyframe(0.0f, start); + if(duration != 0) { + this->callbackAnimation.addKeyframe(0.0f, start); + } this->callbackAnimation.addKeyframe(duration, end); } @@ -38,7 +40,8 @@ VisualNovelTransformItemEvent::VisualNovelTransformItemEvent( this->callbackAnimation.setCallback( &item->transform, &Transform::setLocalPosition ); - this->relative = true; + + if(duration != 0) this->relative = true; this->callbackAnimation.addKeyframe(duration, end); } diff --git a/src/dawnpokergame/scenes/Scene_1.hpp b/src/dawnpokergame/scenes/Scene_1.hpp index ec08222f..541f14d9 100644 --- a/src/dawnpokergame/scenes/Scene_1.hpp +++ b/src/dawnpokergame/scenes/Scene_1.hpp @@ -19,6 +19,8 @@ namespace Dawn { void vnStage() override { this->death = DeathPrefab::create(this); + this->death->material->color.a = 0; + // this->death->transform.setLocalPosition(glm::vec3(-100, 0, 0)); } void onSceneEnded() { @@ -48,9 +50,10 @@ namespace Dawn { auto start = new VisualNovelPauseEvent(vnManager, 0.1f); start ->then(new VisualNovelTextboxEvent(vnManager, this->death->vnCharacter, this->death->emotionHappy, "scene.1.1")) + ->then(new VisualNovelFadeCharacterEvent(vnManager, this->death->vnCharacter, true, &easeOutQuad, 1.0f)) // ->then(new VisualNovelCallbackEvent(vnManager, this, &Scene_1::onSceneEnded)) ; return start; - } + } }; } \ No newline at end of file