etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2025-01-03 06:01:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

GUI: instrument selector

Browse source
This commit is contained in:
tildearrow 2021-12-11 16:44:02 -05:00
parent c6ca40494a
commit 2f813c55e0
7 changed files with 34 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -12,3 +12,6 @@
[submodule "extern/imgui"]
path = extern/imgui
url = https://github.com/ocornut/imgui.git
[submodule "extern/fmt"]
path = extern/fmt
url = https://github.com/fmtlib/fmt.git

14
CMakeLists.txt
View file

@ -9,6 +9,8 @@ else()
set(BUILD_GUI ON)
endif()
add_subdirectory(extern/fmt)
set(BUILD_TESTING OFF)
set(BUILD_PROGRAMS OFF)
set(BUILD_EXAMPLES OFF)
@ -20,13 +22,17 @@ if (WIN32)
add_subdirectory(extern/zlib)
set(HAVE_SDL2 SDL2-static)
set(HAVE_Z zlibstatic)
include_directories(extern/imgui extern/imgui/backends extern/zlib ${CMAKE_CURRENT_BINARY_DIR}/extern/zlib)
include_directories(extern/imgui extern/imgui/backends extern/zlib ${CMAKE_CURRENT_BINARY_DIR}/extern/zlib extern/fmt/include)
else()
if (BUILD_GUI)
set(SDL_SHARED ON)
add_subdirectory(extern/SDL)
include_directories(extern/SDL/include extern/imgui extern/imgui/backends)
set(HAVE_SDL2 SDL2)
include_directories(extern/SDL/include extern/imgui extern/imgui/backends extern/fmt/include)
if (APPLE)
set(HAVE_SDL2 SDL2-static)
else()
set(HAVE_SDL2 SDL2)
endif()
else()
find_library(HAVE_SDL2 SDL2)
endif()
@ -119,7 +125,7 @@ else()
add_executable(furnace ${ENGINE_SOURCES} ${AUDIO_SOURCES} src/main.cpp)
endif()
target_link_libraries(furnace ${HAVE_SDL2} ${HAVE_Z} sndfile)
target_link_libraries(furnace ${HAVE_SDL2} ${HAVE_Z} sndfile fmt)
if (HAVE_JACK)
target_link_libraries(furnace ${HAVE_JACK})

1
extern/fmt vendored Submodule

@ -0,0 +1 @@
Subproject commit 3a951a66cb0fb53ff5a9d5ce9c77e05ef9d382ce

2
src/audio/sdl.h
View file

@ -1,5 +1,5 @@
#include "taAudio.h"
#ifdef _WIN32
#if defined(_WIN32) || defined(HAVE_GUI)
#include <SDL.h>
#else
#include <SDL2/SDL.h>

1
src/engine/platform/genesis.cpp
View file

@ -99,6 +99,7 @@ void DivPlatformGenesis::tick() {
int freqt=toFreq(chan[i].freq);
writes.emplace(chanOffs[i]+0xa4,freqt>>8);
writes.emplace(chanOffs[i]+0xa0,freqt&0xff);
chan[i].freqChanged=false;
}
if (chan[i].keyOn) {
writes.emplace(0x28,0xf0|konOffs[i]);

17
src/gui/gui.cpp
View file

@ -2,6 +2,7 @@
#include "fonts.h"
#include "../ta-log.h"
#include "imgui.h"
#include <fmt/printf.h>
void FurnaceGUI::bindEngine(DivEngine* eng) {
e=eng;
@ -41,6 +42,16 @@ bool FurnaceGUI::loop() {
}
ImGui::End();
if (ImGui::Begin("Instruments")) {
for (int i=0; i<e->song.ins.size(); i++) {
DivInstrument* ins=e->song.ins[i];
if (ImGui::Selectable(fmt::sprintf("%d: %s##_INS%d\n",i,ins->name,i).c_str(),curIns==i)) {
curIns=i;
}
}
}
ImGui::End();
SDL_RenderClear(sdlRend);
ImGui::Render();
ImGui_ImplSDLRenderer_RenderDrawData(ImGui::GetDrawData());
@ -88,5 +99,7 @@ FurnaceGUI::FurnaceGUI():
quit(false),
scrW(1280),
scrH(800),
dpiScale(2) {
}
dpiScale(1),
curIns(0),
curOctave(3) {
}

4
src/gui/gui.h
View file

@ -19,9 +19,11 @@ class FurnaceGUI {
ImFont* mainFont;
ImFont* patFont;
int curIns, curOctave;
public:
void bindEngine(DivEngine* eng);
bool loop();
bool init();
FurnaceGUI();
};
};