evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make text anchors in LargeCharPlate configurable

Browse Source 
also gave the char previews some animation!
This commit is contained in:
Kae 2024-05-23 11:43:15 +10:00
parent 3addf35a2c
commit f42031dc9e
3 changed files with 57 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/frontend/StarCharSelection.cpp
View File

@ -77,7 +77,9 @@ void CharSelectionPane::updateCharacterPlates() {
auto updatePlayerLine = [this](String name, unsigned scrollPosition) { auto updatePlayerLine = [this](String name, unsigned scrollPosition) {
auto charSelector = fetchChild<LargeCharPlateWidget>(name); auto charSelector = fetchChild<LargeCharPlateWidget>(name);
if (auto playerUuid = m_playerStorage->playerUuidAt(scrollPosition)) { if (auto playerUuid = m_playerStorage->playerUuidAt(scrollPosition)) {
charSelector->setPlayer(m_playerStorage->loadPlayer(*playerUuid)); auto player = m_playerStorage->loadPlayer(*playerUuid);
player->humanoid()->setFacingDirection(Direction::Right);
charSelector->setPlayer(player);
charSelector->enableDelete([this, playerUuid](Widget*) { m_deleteCallback(*playerUuid); }); charSelector->enableDelete([this, playerUuid](Widget*) { m_deleteCallback(*playerUuid); });
} else { } else {
charSelector->setPlayer(PlayerPtr()); charSelector->setPlayer(PlayerPtr());

78
source/windowing/StarLargeCharPlateWidget.cpp
View File

@ -12,51 +12,59 @@ LargeCharPlateWidget::LargeCharPlateWidget(WidgetCallbackFunc mainCallback, Play
setSize(ButtonWidget::size()); setSize(ButtonWidget::size());
auto assets = Root::singleton().assets(); auto assets = Root::singleton().assets();
auto charPlateImage = assets->json("/interface.config:largeCharPlate.backingImage").toString(); m_config = assets->json("/interface.config:largeCharPlate");
auto charPlateImage = m_config.getString("backingImage");
setCallback(mainCallback); setCallback(mainCallback);
setImages(charPlateImage); setImages(charPlateImage);
m_playerPlate = charPlateImage; m_playerPlate = charPlateImage;
m_playerPlateHover = assets->json("/interface.config:largeCharPlate.playerHover").toString(); m_playerPlateHover = m_config.getString("playerHover");
m_noPlayerPlate = assets->json("/interface.config:largeCharPlate.noPlayer").toString(); m_noPlayerPlate = m_config.getString("noPlayer");
m_noPlayerPlateHover = assets->json("/interface.config:largeCharPlate.noPlayerHover").toString(); m_noPlayerPlateHover = m_config.getString("noPlayerHover");
m_portraitOffset = jsonToVec2I(assets->json("/interface.config:largeCharPlate.portraitOffset")); m_portraitOffset = jsonToVec2I(m_config.get("portraitOffset"));
m_portraitScale = assets->json("/interface.config:largeCharPlate.portraitScale").toFloat(); m_portraitScale = m_config.getFloat("portraitScale");
String switchText = assets->json("/interface.config:largeCharPlate.switchText").toString(); String switchText = m_config.getString("switchText");
String createText = assets->json("/interface.config:largeCharPlate.createText").toString(); String createText = m_config.getString("createText");
m_portrait = make_shared<PortraitWidget>(); m_portrait = make_shared<PortraitWidget>();
m_portrait->setScale(m_portraitScale); m_portrait->setScale(m_portraitScale);
m_portrait->setPosition(m_portraitOffset); m_portrait->setPosition(m_portraitOffset);
m_portrait->setRenderHumanoid(true);
addChild("portrait", m_portrait); addChild("portrait", m_portrait);
String modeLabelText = assets->json("/interface.config:largeCharPlate.modeText").toString(); String modeLabelText = m_config.getString("modeText");
m_regularTextColor = Color::rgb(jsonToVec3B(assets->json("/interface.config:largeCharPlate.textColor"))); m_regularTextColor = Color::rgb(jsonToVec3B(m_config.get("textColor")));
m_disabledTextColor = Color::rgb(jsonToVec3B(assets->json("/interface.config:largeCharPlate.textColorDisabled"))); m_disabledTextColor = Color::rgb(jsonToVec3B(m_config.get("textColorDisabled")));
m_modeNameOffset = jsonToVec2I(assets->json("/interface.config:largeCharPlate.modeNameOffset")); m_modeNameOffset = jsonToVec2I(m_config.get("modeNameOffset"));
m_modeOffset = jsonToVec2I(assets->json("/interface.config:largeCharPlate.modeOffset")); m_modeOffset = jsonToVec2I(m_config.get("modeOffset"));
m_modeName = make_shared<LabelWidget>(modeLabelText, Color::White, HorizontalAnchor::HMidAnchor); auto modeNameHAnchor = HorizontalAnchorNames.getLeft(m_config.getString("modeNameHAnchor", "mid"));
auto modeNameVAnchor = VerticalAnchorNames .getLeft(m_config.getString("modeNameVAnchor", "bottom"));
m_modeName = make_shared<LabelWidget>(modeLabelText, Color::White, modeNameHAnchor);
addChild("modeName", m_modeName); addChild("modeName", m_modeName);
m_modeName->setPosition(m_modeNameOffset); m_modeName->setPosition(m_modeNameOffset);
m_modeName->setAnchor(HorizontalAnchor::HMidAnchor, VerticalAnchor::BottomAnchor); m_modeName->setAnchor(modeNameHAnchor, modeNameVAnchor);
auto modeHAnchor = HorizontalAnchorNames.getLeft(m_config.getString("modeHAnchor", "left"));
auto modeVAnchor = VerticalAnchorNames .getLeft(m_config.getString("modeVAnchor", "bottom"));
m_mode = make_shared<LabelWidget>(); m_mode = make_shared<LabelWidget>();
addChild("mode", m_mode); addChild("mode", m_mode);
m_mode->setPosition(m_modeOffset); m_mode->setPosition(m_modeOffset);
m_mode->setAnchor(HorizontalAnchor::LeftAnchor, VerticalAnchor::BottomAnchor); m_mode->setAnchor(modeHAnchor, modeVAnchor);
m_createCharText = assets->json("/interface.config:largeCharPlate.noPlayerText").toString(); m_createCharText = m_config.getString("noPlayerText");
m_createCharTextColor = Color::rgb(jsonToVec3B(assets->json("/interface.config:largeCharPlate.noPlayerTextColor"))); m_createCharTextColor = Color::rgb(jsonToVec3B(m_config.get("noPlayerTextColor")));
m_playerNameOffset = jsonToVec2I(assets->json("/interface.config:largeCharPlate.playerNameOffset")); m_playerNameOffset = jsonToVec2I(m_config.get("playerNameOffset"));
auto playerNameHAnchor = HorizontalAnchorNames.getLeft(m_config.getString("playerNameHAnchor", "mid"));
auto playerNameVAnchor = VerticalAnchorNames .getLeft(m_config.getString("playerNameVAnchor", "bottom"));
m_playerName = make_shared<LabelWidget>(); m_playerName = make_shared<LabelWidget>();
m_playerName->setColor(m_createCharTextColor); m_playerName->setColor(m_createCharTextColor);
m_playerName->setPosition(m_playerNameOffset); m_playerName->setPosition(m_playerNameOffset);
m_playerName->setAnchor(HorizontalAnchor::HMidAnchor, VerticalAnchor::BottomAnchor); m_playerName->setAnchor(playerNameHAnchor, playerNameVAnchor);
addChild("player", m_playerName); addChild("player", m_playerName);
} }
@ -121,13 +129,12 @@ void LargeCharPlateWidget::setPlayer(PlayerPtr player) {
void LargeCharPlateWidget::enableDelete(WidgetCallbackFunc const& callback) { void LargeCharPlateWidget::enableDelete(WidgetCallbackFunc const& callback) {
disableDelete(); disableDelete();
auto assets = Root::singleton().assets(); auto trashButton = m_config.get("trashButton");
auto baseImage = trashButton.getString("baseImage");
auto baseImage = assets->json("/interface.config:largeCharPlate.trashButton.baseImage").toString(); auto hoverImage = trashButton.getString("hoverImage");
auto hoverImage = assets->json("/interface.config:largeCharPlate.trashButton.hoverImage").toString(); auto pressedImage = trashButton.getString("pressedImage");
auto pressedImage = assets->json("/interface.config:largeCharPlate.trashButton.pressedImage").toString(); auto disabledImage = trashButton.getString("disabledImage");
auto disabledImage = assets->json("/interface.config:largeCharPlate.trashButton.disabledImage").toString(); auto offset = jsonToVec2I(trashButton.get("offset"));
auto offset = jsonToVec2I(assets->json("/interface.config:largeCharPlate.trashButton.offset"));
m_delete = make_shared<ButtonWidget>(callback, baseImage, hoverImage, pressedImage, disabledImage); m_delete = make_shared<ButtonWidget>(callback, baseImage, hoverImage, pressedImage, disabledImage);
addChild("trashButton", m_delete); addChild("trashButton", m_delete);
@ -157,4 +164,21 @@ bool LargeCharPlateWidget::sendEvent(InputEvent const& event) {
return ButtonWidget::sendEvent(event); return ButtonWidget::sendEvent(event);
} }
void LargeCharPlateWidget::update(float dt) {
ButtonWidget::update(dt);
if (!m_player || !m_config.getBool("animatePortrait", true))
return;
auto humanoid = m_player->humanoid();
if (m_delete->isHovered()) {
humanoid->setEmoteState(HumanoidEmote::Sad);
humanoid->setState(Humanoid::Run);
} else {
humanoid->setEmoteState(HumanoidEmote::Idle);
humanoid->setState(isHovered() ? Humanoid::Walk : Humanoid::Idle);
}
humanoid->animate(dt);
}
} }

3
source/windowing/StarLargeCharPlateWidget.hpp
View File

@ -23,11 +23,14 @@ public:
virtual bool sendEvent(InputEvent const& event) override; virtual bool sendEvent(InputEvent const& event) override;
void update(float dt) override;
protected: protected:
virtual void renderImpl() override; virtual void renderImpl() override;
private: private:
PlayerPtr m_player; PlayerPtr m_player;
Json m_config;
PortraitWidgetPtr m_portrait; PortraitWidgetPtr m_portrait;
Vec2I m_portraitOffset; Vec2I m_portraitOffset;