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

Make zoom key-binds holdable

Browse Source 
also fixed some random UI shine cause it was the wrong freaking size
This commit is contained in:
Kae 2024-04-27 16:31:10 +10:00
parent a5fc77820f
commit 2a751e2e37
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/opensb/interface/merchant/shine.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 866 B

31
source/client/StarClientApplication.cpp
View File

@ -17,6 +17,7 @@
#include "StarInput.hpp"
#include "StarVoice.hpp"
#include "StarCurve25519.hpp"
#include "StarInterpolation.hpp"
#include "StarInterfaceLuaBindings.hpp"
#include "StarInputLuaBindings.hpp"
@ -316,17 +317,6 @@ void ClientApplication::processInput(InputEvent const& event) {
}
m_input->handleInput(event, processed);
auto config = m_root->configuration();
int zoomOffset = 0;
if (auto presses = m_input->bindDown("opensb", "zoomIn"))
zoomOffset += *presses;
if (auto presses = m_input->bindDown("opensb", "zoomOut"))
zoomOffset -= *presses;
if (zoomOffset != 0)
config->set("zoomLevel", max(1.0f, round(config->get("zoomLevel").toFloat() + zoomOffset)));
}
void ClientApplication::update() {
@ -882,6 +872,25 @@ void ClientApplication::updateRunning(float dt) {
m_player->addEmote(HumanoidEmote::Eat);
if (isActionTakenEdge(InterfaceAction::EmoteSleep))
m_player->addEmote(HumanoidEmote::Sleep);
if (int newZoomDirection = (int)m_input->bindHeld("opensb", "zoomIn") - (int)m_input->bindHeld("opensb", "zoomOut"))
m_cameraZoomDirection = newZoomDirection;
}
if (m_cameraZoomDirection != 0) {
const float threshold = 0.01f;
bool goingIn = m_cameraZoomDirection == 1;
auto config = m_root->configuration();
float curZoom = config->get("zoomLevel").toFloat(),
newZoom = max(1.f, curZoom * powf(1.f + (float)m_cameraZoomDirection * 0.5f, min(1.f, dt * 5.f))),
intZoom = max(1.f, (goingIn ? floor(curZoom) : ceil(curZoom)) + m_cameraZoomDirection);
bool pastInt = goingIn ? newZoom + threshold > intZoom
: newZoom - threshold < intZoom;
if (pastInt) {
float intNewZoom = goingIn ? ceil(newZoom) : floor(newZoom);
newZoom = lerp(clamp(abs(intZoom - newZoom) - 1.f, 0.f, 1.f), intZoom, intNewZoom);
m_cameraZoomDirection = 0;
}
config->set("zoomLevel", newZoom);
}
if (m_controllerLeftStick.magnitudeSquared() > 0.001f)

1
source/client/StarClientApplication.hpp
View File

@ -108,6 +108,7 @@ private:
int m_cameraOffsetDownTicks = 0;
Vec2F m_cameraPositionSmoother;
Vec2F m_cameraSmoothDelta;
int m_cameraZoomDirection;
int m_minInterfaceScale = 2;
int m_maxInterfaceScale = 3;