etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-11-30 08:23:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

GUI: more intuitive wave height number

Browse source
This commit is contained in:
tildearrow 2023-02-06 04:02:29 -05:00
parent c7d75f45f1
commit ab4bc4dfda
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gui/gui.cpp
View file

@ -6154,7 +6154,7 @@ FurnaceGUI::FurnaceGUI():
waveGenPower(1), waveGenPower(1),
waveGenInvertPoint(1.0f), waveGenInvertPoint(1.0f),
waveGenScaleX(32), waveGenScaleX(32),
waveGenScaleY(31), waveGenScaleY(32),
waveGenOffsetX(0), waveGenOffsetX(0),
waveGenOffsetY(0), waveGenOffsetY(0),
waveGenSmooth(1), waveGenSmooth(1),

12
src/gui/waveEdit.cpp
View file

@ -509,13 +509,15 @@ void FurnaceGUI::drawWaveEdit() {
ImGui::SameLine(); ImGui::SameLine();
ImGui::Text("Height"); ImGui::Text("Height");
if (ImGui::IsItemHovered()) { if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("use a height of:\n- 15 for Game Boy, WonderSwan, Namco WSG, Konami Bubble System, X1-010 Envelope shape and N163\n- 31 for PC Engine\n- 63 for FDS and Virtual Boy\n- 255 for X1-010 and SCC\nany other heights will be scaled during playback."); ImGui::SetTooltip("use a height of:\n- 16 for Game Boy, WonderSwan, Namco WSG, Konami Bubble System, X1-010 Envelope shape and N163\n- 32 for PC Engine\n- 64 for FDS and Virtual Boy\n- 256 for X1-010 and SCC\nany other heights will be scaled during playback.");
} }
ImGui::SameLine(); ImGui::SameLine();
ImGui::SetNextItemWidth(96.0f*dpiScale); ImGui::SetNextItemWidth(96.0f*dpiScale);
if (ImGui::InputInt("##_WTH",&wave->max,1,2)) { int realMax=wave->max+1;
if (wave->max>255) wave->max=255; if (ImGui::InputInt("##_WTH",&realMax,1,2)) {
if (wave->max<1) wave->max=1; if (realMax>256) realMax=256;
if (realMax<2) realMax=2;
wave->max=realMax-1;
e->notifyWaveChange(curWave); e->notifyWaveChange(curWave);
MARK_MODIFIED; MARK_MODIFIED;
} }
@ -948,7 +950,7 @@ void FurnaceGUI::drawWaveEdit() {
if (ImGui::Button("Scale Y")) { if (ImGui::Button("Scale Y")) {
if (waveGenScaleY>0 && wave->max!=(waveGenScaleY-1)) e->lockEngine([this,wave]() { if (waveGenScaleY>0 && wave->max!=(waveGenScaleY-1)) e->lockEngine([this,wave]() {
for (int i=0; i<wave->len; i++) { for (int i=0; i<wave->len; i++) {
wave->data[i]=(wave->data[i]*(waveGenScaleY+1))/(wave->max+1); wave->data[i]=(wave->data[i]*(waveGenScaleY))/(wave->max+1);
} }
wave->max=waveGenScaleY-1; wave->max=waveGenScaleY-1;
MARK_MODIFIED; MARK_MODIFIED;