john/prosperon
1
0
Fork 0
Code Issues Pull requests Actions Releases Activity

fix sounds; add imgui

Browse source
This commit is contained in:
John Alanbrook 2024-09-07 15:14:03 -05:00
parent 188c55a8e0
commit a1cd43bcfd
2 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/sound.js
View file

@ -56,6 +56,10 @@ var song;
// Play 'file' for new song, cross fade for seconds // Play 'file' for new song, cross fade for seconds
audio.music = function(file, fade = 0.5) { audio.music = function(file, fade = 0.5) {
if (!file) {
if (song)
song.volume = 0;
}
file = Resources.find_sound(file); file = Resources.find_sound(file);
if (!fade) { if (!fade) {
song = audio.play(file, audio.bus.music); song = audio.play(file, audio.bus.music);

24
source/engine/gui.cpp
View file

@ -162,8 +162,8 @@ JSC_CCALL(imgui_image,
simgui_destroy_image(simgui_img); simgui_destroy_image(simgui_img);
) )
JSC_CCALL(imgui_sameline, ImGui::SameLine() ) JSC_CCALL(imgui_sameline, ImGui::SameLine(js2number(argv[0])) )
JSC_SCALL(imgui_columns, ImGui::Columns(js2number(argv[1]), str) ) JSC_CCALL(imgui_columns, ImGui::Columns(js2number(argv[0])) )
JSC_CCALL(imgui_nextcolumn, ImGui::NextColumn() ) JSC_CCALL(imgui_nextcolumn, ImGui::NextColumn() )
JSC_SCALL(imgui_collapsingheader, ret = boolean2js(ImGui::CollapsingHeader(str)) ) JSC_SCALL(imgui_collapsingheader, ret = boolean2js(ImGui::CollapsingHeader(str)) )
JSC_SCALL(imgui_radio, ret = boolean2js(ImGui::RadioButton(str, js2boolean(argv[1])))) JSC_SCALL(imgui_radio, ret = boolean2js(ImGui::RadioButton(str, js2boolean(argv[1]))))
@ -175,6 +175,20 @@ JSC_SCALL(imgui_tree,
} }
) )
JSC_SCALL(imgui_tabbar,
if (ImGui::BeginTabBar(str)) {
script_call_sym(argv[1],0,NULL);
ImGui::EndTabBar();
}
)
JSC_SCALL(imgui_tab,
if (ImGui::BeginTabItem(str)) {
script_call_sym(argv[1],0,NULL);
ImGui::EndTabItem();
}
)
JSC_SCALL(imgui_listbox, JSC_SCALL(imgui_listbox,
char **arr = js2strarr(argv[1]); char **arr = js2strarr(argv[1]);
int n = js_arrlen(argv[1]); int n = js_arrlen(argv[1]);
@ -196,7 +210,7 @@ JSC_SCALL(imgui_int,
static const JSCFunctionListEntry js_imgui_funcs[] = { static const JSCFunctionListEntry js_imgui_funcs[] = {
MIST_FUNC_DEF(imgui, window, 2), MIST_FUNC_DEF(imgui, window, 2),
MIST_FUNC_DEF(imgui, menu, 2), MIST_FUNC_DEF(imgui, menu, 2),
MIST_FUNC_DEF(imgui, sameline, 0), MIST_FUNC_DEF(imgui, sameline, 1),
MIST_FUNC_DEF(imgui, int, 2), MIST_FUNC_DEF(imgui, int, 2),
MIST_FUNC_DEF(imgui, pushid, 1), MIST_FUNC_DEF(imgui, pushid, 1),
MIST_FUNC_DEF(imgui, popid, 0), MIST_FUNC_DEF(imgui, popid, 0),
@ -214,11 +228,13 @@ static const JSCFunctionListEntry js_imgui_funcs[] = {
MIST_FUNC_DEF(imgui, plot,1), MIST_FUNC_DEF(imgui, plot,1),
MIST_FUNC_DEF(imgui, lineplot,2), MIST_FUNC_DEF(imgui, lineplot,2),
MIST_FUNC_DEF(imgui, sokol_gfx, 0), MIST_FUNC_DEF(imgui, sokol_gfx, 0),
MIST_FUNC_DEF(imgui, columns, 2), MIST_FUNC_DEF(imgui, columns, 1),
MIST_FUNC_DEF(imgui, nextcolumn, 0), MIST_FUNC_DEF(imgui, nextcolumn, 0),
MIST_FUNC_DEF(imgui, collapsingheader, 1), MIST_FUNC_DEF(imgui, collapsingheader, 1),
MIST_FUNC_DEF(imgui, tree, 2), MIST_FUNC_DEF(imgui, tree, 2),
MIST_FUNC_DEF(imgui, listbox, 3), MIST_FUNC_DEF(imgui, listbox, 3),
MIST_FUNC_DEF(imgui, tabbar, 2),
MIST_FUNC_DEF(imgui, tab, 2),
}; };
static int started = 0; static int started = 0;