YourWishes/Dawn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Working on removing ui label

Browse Source
This commit is contained in:
Dominic Masters
2023-06-12 10:09:45 -07:00
parent c7d5377b9c
commit 29bb22b5d0
14 changed files with 102 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
src/dawn/scene/components/ui/UILabel.cpp → archive/UILabel.cpp
View File

0
src/dawn/scene/components/ui/UILabel.hpp → archive/UILabel.hpp
View File

6
assets/games/liminal/prefabs/VNTextbox.xml
View File

@ -14,7 +14,7 @@
/>
<child ref="test123">
<UILabel
<!-- <UILabel
text="This is the text box."
font="font_main"
fontSize="48"
@ -22,8 +22,8 @@
alignX="UI_COMPONENT_ALIGN_MIDDLE"
alignY="UI_COMPONENT_ALIGN_MIDDLE"
ref="uiLabel"
/>
/> -->
</child>
<VNTextboxScroller ref="textboxScroller" label="uiLabel" />
<!-- <VNTextboxScroller ref="textboxScroller" label="uiLabel" /> -->
</prefab>

4
assets/prefabs/ui/debug/FPSLabel.xml
View File

@ -1,4 +1,4 @@
<prefab name="FPSLabel" type="ui/debug">
<UILabel ref="label" text="Hello World" />
<FPSLabelComponent label="label" />
<!-- <UILabel ref="label" text="Hello World" /> -->
<!-- <FPSLabelComponent label="label" /> -->
</prefab>

138
src/dawn/games/vn/components/VNTextboxScroller.cpp
View File

@ -15,86 +15,90 @@ VNTextboxScroller::VNTextboxScroller(SceneItem *item) :
}
void VNTextboxScroller::onStart() {
assertNotNull(label);
// assertNotNull(label);
std::function<void()> x = [&]{
this->lineCurrent = 0;
this->timeCharacter = 0;
this->label->startQuad = 0;
this->label->quadCount = 0;
this->readyToClose = false;
};
x();
// std::function<void()> x = [&]{
// this->lineCurrent = 0;
// this->timeCharacter = 0;
// this->label->startQuad = 0;
// this->label->quadCount = 0;
// this->readyToClose = false;
// };
// x();
useEvent(x, this->label->eventTextChanged);
// useEvent(x, this->label->eventTextChanged);
useEvent([&](float_t delta){
auto game = this->getGame();
// useEvent([&](float_t delta){
// auto game = this->getGame();
this->timeCharacter += delta;
if(this->hasRevealedAllCurrentCharacters()) {
if(this->hasRevealedAllCharacters()) {
if(!this->readyToClose) {
this->readyToClose = true;
this->eventReadyToClose.invoke();
}
} else {
if(game->inputManager.isPressed(INPUT_BIND_ACCEPT)) {
this->lineCurrent += this->getCountOfVisibleLines();
this->label->startQuad = 0;
for(int32_t i = 0; i < this->lineCurrent; i++) {
this->label->startQuad += this->label->measure.getQuadsOnLine(i);
}
this->label->quadCount = 0;
this->timeCharacter = 0.0f;
}
}
return;
}
// this->timeCharacter += delta;
// if(this->hasRevealedAllCurrentCharacters()) {
// if(this->hasRevealedAllCharacters()) {
// if(!this->readyToClose) {
// this->readyToClose = true;
// this->eventReadyToClose.invoke();
// }
// } else {
// if(game->inputManager.isPressed(INPUT_BIND_ACCEPT)) {
// this->lineCurrent += this->getCountOfVisibleLines();
// this->label->startQuad = 0;
// for(int32_t i = 0; i < this->lineCurrent; i++) {
// this->label->startQuad += this->label->measure.getQuadsOnLine(i);
// }
// this->label->quadCount = 0;
// this->timeCharacter = 0.0f;
// }
// }
// return;
// }
auto lastTimeCharacter = mathFloor<int32_t>(this->timeCharacter);
if(game->inputManager.isDown(INPUT_BIND_ACCEPT)) {
this->timeCharacter += game->timeManager.delta * VN_TEXTBOX_SPEED_FASTER;
} else {
this->timeCharacter += game->timeManager.delta * VN_TEXTBOX_SPEED;
}
// auto lastTimeCharacter = mathFloor<int32_t>(this->timeCharacter);
// if(game->inputManager.isDown(INPUT_BIND_ACCEPT)) {
// this->timeCharacter += game->timeManager.delta * VN_TEXTBOX_SPEED_FASTER;
// } else {
// this->timeCharacter += game->timeManager.delta * VN_TEXTBOX_SPEED;
// }
auto newCount = mathFloor<int32_t>(this->timeCharacter);
if(newCount == this->label->quadCount) return;
this->label->quadCount = mathFloor<int32_t>(this->timeCharacter);
this->eventCharacterRevealed.invoke();
}, getScene()->eventSceneUpdate);
// auto newCount = mathFloor<int32_t>(this->timeCharacter);
// if(newCount == this->label->quadCount) return;
// this->label->quadCount = mathFloor<int32_t>(this->timeCharacter);
// this->eventCharacterRevealed.invoke();
// }, getScene()->eventSceneUpdate);
assertUnreachable();
}
size_t VNTextboxScroller::getCountOfVisibleLines() {
float_t y = this->label->getHeight();
size_t i = 1;
for(i = this->label->measure.getLineCount(); i > 0; --i) {
if(y >= this->label->measure.getHeightOfLineCount(i)) {
return i;
}
}
return this->label->measure.getLineCount();
// float_t y = this->label->getHeight();
// size_t i = 1;
// for(i = this->label->measure.getLineCount(); i > 0; --i) {
// if(y >= this->label->measure.getHeightOfLineCount(i)) {
// return i;
// }
// }
// return this->label->measure.getLineCount();
assertUnreachable();
}
bool_t VNTextboxScroller::hasRevealedAllCurrentCharacters() {
int32_t quadsTotal = 0;
for(
size_t i = this->lineCurrent;
i < mathMin<size_t>(
this->label->measure.getLineCount(),
this->lineCurrent + this->getCountOfVisibleLines()
);
i++
) {
quadsTotal += this->label->measure.getQuadsOnLine(i);
}
return mathFloor<int32_t>(this->timeCharacter) >= quadsTotal;
// int32_t quadsTotal = 0;
// for(
// size_t i = this->lineCurrent;
// i < mathMin<size_t>(
// this->label->measure.getLineCount(),
// this->lineCurrent + this->getCountOfVisibleLines()
// );
// i++
// ) {
// quadsTotal += this->label->measure.getQuadsOnLine(i);
// }
// return mathFloor<int32_t>(this->timeCharacter) >= quadsTotal;
assertUnreachable();
}
bool_t VNTextboxScroller::hasRevealedAllCharacters() {
return (
this->lineCurrent + this->getCountOfVisibleLines() >=
this->label->measure.getLineCount()
);
// return (
// this->lineCurrent + this->getCountOfVisibleLines() >=
// this->label->measure.getLineCount()
// );
assertUnreachable();
}

4
src/dawn/games/vn/components/VNTextboxScroller.hpp
View File

@ -5,7 +5,7 @@
#pragma once
#include "scene/SceneItemComponent.hpp"
#include "scene/components/ui/UILabel.hpp"
#include "scene/components/ui/text/UILabelNew.hpp"
#include "input/InputManager.hpp"
#define VN_TEXTBOX_SPEED 25.0f
@ -15,7 +15,7 @@ namespace Dawn {
class VNTextboxScroller : public SceneItemComponent {
public:
// @optional
StateProperty<UILabel*> label;
StateProperty<UILabelNew*> label;
StateEvent<> eventReadyToClose;
StateEvent<> eventCharacterRevealed;

3
src/dawn/games/vn/events/VNTextEvent.hpp
View File

@ -20,7 +20,8 @@ namespace Dawn {
scroller = this->getScene()->findComponent<VNTextboxScroller>();
assertNotNull(scroller);
scroller->label->text = text;
assertUnreachable();
// scroller->label->text = text;
useEvent([&](inputbind_t bind){
if(bind != INPUT_BIND_ACCEPT) return;

3
src/dawn/scene/components/debug/FPSLabelComponent.cpp
View File

@ -18,6 +18,7 @@ void FPSLabelComponent::onStart() {
if(this->label == nullptr) return;
std::string strFps = std::to_string((int32_t)(1.0f / delta));
std::string strTick = std::to_string((int32_t)(delta * 1000.0f));
label->text = strFps + "FPS (" + strTick + "ms)";
assertUnreachable();// Needs updating to new UI Label
// label->text = strFps + "FPS (" + strTick + "ms)";
}, this->item->scene->eventSceneUnpausedUpdate);
}

4
src/dawn/scene/components/debug/FPSLabelComponent.hpp
View File

@ -4,13 +4,13 @@
// https://opensource.org/licenses/MIT
#pragma once
#include "scene/components/ui/UILabel.hpp"
#include "scene/components/ui/text/UILabelNew.hpp"
namespace Dawn {
class FPSLabelComponent : public SceneItemComponent {
public:
/* @optional */
UILabel *label = nullptr;
UILabelNew *label = nullptr;
FPSLabelComponent(SceneItem *item);
void onStart() override;

5
src/dawn/scene/components/ui/CMakeLists.txt
View File

@ -9,10 +9,9 @@ target_sources(${DAWN_TARGET_NAME}
UICanvas.cpp
UIComponent.cpp
UIComponentRenderable.cpp
UILabel.cpp
UIImage.cpp
UIBorder.cpp
UILabelNew.cpp
)
add_subdirectory(menu)
add_subdirectory(menu)
add_subdirectory(text)

10
src/dawn/scene/components/ui/text/CMakeLists.txt Normal file
View File

@ -0,0 +1,10 @@
# Copyright (c) 2022 Dominic Masters
#
# This software is released under the MIT License.
# https://opensource.org/licenses/MIT
# Sources
target_sources(${DAWN_TARGET_NAME}
PRIVATE
UILabelNew.cpp
)

0
src/dawn/scene/components/ui/UILabelNew.cpp → src/dawn/scene/components/ui/text/UILabelNew.cpp
View File

9
src/dawn/scene/components/ui/UILabelNew.hpp → src/dawn/scene/components/ui/text/UILabelNew.hpp
View File

@ -21,10 +21,11 @@ namespace Dawn {
std::string text;
struct UILabelStyle style;
// Part index
// Quad start
// position
// size
// Part index?
// Quad start?
// quad count?
// position?
// size?
// some kind of custom data e.g. wobble or shake?
usagelockid_t lockId = -1;

2
src/dawnliminal/scenes/HelloWorldScene.hpp
View File

@ -7,7 +7,7 @@
#include "scene/Scene.hpp"
#include "prefabs/SimpleSpinningCubePrefab.hpp"
#include "scene/components/display/Camera.hpp"
#include "scene/components/ui/UILabelNew.hpp"
#include "scene/components/ui/text/UILabelNew.hpp"
namespace Dawn {
class HelloWorldScene : public Scene {