diff --git a/bin/ios64/libduktape_dll_ios64.so b/bin/ios64/libduktape_dll_ios64.so new file mode 100644 index 0000000..ba70ba2 Binary files /dev/null and b/bin/ios64/libduktape_dll_ios64.so differ diff --git a/bin/ios64/libhmm_dll_ios64.so b/bin/ios64/libhmm_dll_ios64.so index f505d1a..32c0f36 100644 Binary files a/bin/ios64/libhmm_dll_ios64.so and b/bin/ios64/libhmm_dll_ios64.so differ diff --git a/bin/ios64/libremotery_dll_ios64.so b/bin/ios64/libremotery_dll_ios64.so index 39eebb4..d432b07 100644 Binary files a/bin/ios64/libremotery_dll_ios64.so and b/bin/ios64/libremotery_dll_ios64.so differ diff --git a/bin/ios64/libstb_dll_ios64.so b/bin/ios64/libstb_dll_ios64.so index a899863..af3532e 100644 Binary files a/bin/ios64/libstb_dll_ios64.so and b/bin/ios64/libstb_dll_ios64.so differ diff --git a/bin/linux/libduktape_dll.so b/bin/linux/libduktape_dll.so new file mode 100644 index 0000000..8391bba Binary files /dev/null and b/bin/linux/libduktape_dll.so differ diff --git a/bin/linux/libsokol_gp_dll.so b/bin/linux/libsokol_gp_dll.so index afae400..3007267 100644 Binary files a/bin/linux/libsokol_gp_dll.so and b/bin/linux/libsokol_gp_dll.so differ diff --git a/bin/macos/libduktape_dll_macos.so b/bin/macos/libduktape_dll_macos.so new file mode 100644 index 0000000..585f7d6 Binary files /dev/null and b/bin/macos/libduktape_dll_macos.so differ diff --git a/bin/macos/libduktape_dll_macos_arm64.so b/bin/macos/libduktape_dll_macos_arm64.so new file mode 100644 index 0000000..aa305ef Binary files /dev/null and b/bin/macos/libduktape_dll_macos_arm64.so differ diff --git a/bin/macos/libhmm_dll_macos.so b/bin/macos/libhmm_dll_macos.so index 3635b97..d01a125 100755 Binary files a/bin/macos/libhmm_dll_macos.so and b/bin/macos/libhmm_dll_macos.so differ diff --git a/bin/macos/libhmm_dll_macos_arm64.so b/bin/macos/libhmm_dll_macos_arm64.so index d4c4ad6..ea5234f 100755 Binary files a/bin/macos/libhmm_dll_macos_arm64.so and b/bin/macos/libhmm_dll_macos_arm64.so differ diff --git a/bin/macos/libremotery_dll_macos_arm64.so b/bin/macos/libremotery_dll_macos_arm64.so index 00eb7ba..5d3df28 100644 Binary files a/bin/macos/libremotery_dll_macos_arm64.so and b/bin/macos/libremotery_dll_macos_arm64.so differ diff --git a/bin/macos/libsokol_debug_dll_macos_arm64.so b/bin/macos/libsokol_debug_dll_macos_arm64.so index d6eefaf..b526e21 100644 Binary files a/bin/macos/libsokol_debug_dll_macos_arm64.so and b/bin/macos/libsokol_debug_dll_macos_arm64.so differ diff --git a/bin/macos/libsokol_dll_macos_arm64.so b/bin/macos/libsokol_dll_macos_arm64.so index 4bdbe5b..df1b0dc 100644 Binary files a/bin/macos/libsokol_dll_macos_arm64.so and b/bin/macos/libsokol_dll_macos_arm64.so differ diff --git a/bin/macos/libsokol_gp_dll_macos.so b/bin/macos/libsokol_gp_dll_macos.so index 134b80b..5ae7a63 100644 Binary files a/bin/macos/libsokol_gp_dll_macos.so and b/bin/macos/libsokol_gp_dll_macos.so differ diff --git a/bin/macos/libsokol_gp_dll_macos_arm64.so b/bin/macos/libsokol_gp_dll_macos_arm64.so index 82d4140..b000f0e 100644 Binary files a/bin/macos/libsokol_gp_dll_macos_arm64.so and b/bin/macos/libsokol_gp_dll_macos_arm64.so differ diff --git a/bin/macos/libsokol_shape_dll_macos_arm64.so b/bin/macos/libsokol_shape_dll_macos_arm64.so index 0e66b82..66b359e 100644 Binary files a/bin/macos/libsokol_shape_dll_macos_arm64.so and b/bin/macos/libsokol_shape_dll_macos_arm64.so differ diff --git a/bin/macos/libstb_dll_macos_arm64.so b/bin/macos/libstb_dll_macos_arm64.so index f9b78e6..955c492 100644 Binary files a/bin/macos/libstb_dll_macos_arm64.so and b/bin/macos/libstb_dll_macos_arm64.so differ diff --git a/bin/win64/hmm_dll.dll b/bin/win64/hmm_dll.dll index bdfce04..304ecc5 100644 Binary files a/bin/win64/hmm_dll.dll and b/bin/win64/hmm_dll.dll differ diff --git a/bin/win64/remotery_dll.dll b/bin/win64/remotery_dll.dll index 86851ef..5770875 100644 Binary files a/bin/win64/remotery_dll.dll and b/bin/win64/remotery_dll.dll differ diff --git a/bin/win64/sokol_debug_dll.dll b/bin/win64/sokol_debug_dll.dll index 3c9ce5a..f11146d 100644 Binary files a/bin/win64/sokol_debug_dll.dll and b/bin/win64/sokol_debug_dll.dll differ diff --git a/bin/win64/sokol_dll.dll b/bin/win64/sokol_dll.dll index 597e048..9fe0435 100644 Binary files a/bin/win64/sokol_dll.dll and b/bin/win64/sokol_dll.dll differ diff --git a/bin/win64/sokol_gp_dll.dll b/bin/win64/sokol_gp_dll.dll index 7a962b2..e474ede 100644 Binary files a/bin/win64/sokol_gp_dll.dll and b/bin/win64/sokol_gp_dll.dll differ diff --git a/bin/win64/sokol_nuklear_dll.dll b/bin/win64/sokol_nuklear_dll.dll index f00e129..fd113cc 100644 Binary files a/bin/win64/sokol_nuklear_dll.dll and b/bin/win64/sokol_nuklear_dll.dll differ diff --git a/bin/win64/sokol_shape_dll.dll b/bin/win64/sokol_shape_dll.dll index 99eb10e..e84e3d9 100644 Binary files a/bin/win64/sokol_shape_dll.dll and b/bin/win64/sokol_shape_dll.dll differ diff --git a/bin/win64/stb_dll.dll b/bin/win64/stb_dll.dll index 8da6951..45c15a3 100644 Binary files a/bin/win64/stb_dll.dll and b/bin/win64/stb_dll.dll differ diff --git a/data/config/rbuilder.log b/data/config/rbuilder.log index ead50f5..a9719b3 100644 --- a/data/config/rbuilder.log +++ b/data/config/rbuilder.log @@ -1,2 +1 @@ [Info] settings.load projectpath nil, using default settings. -[Info] panel.loadconfig: Loaded path - .\projects\cube_sapp\cube_sapp.slp diff --git a/editor/editor.lua b/editor/editor.lua index afc6a0c..f464ab7 100644 --- a/editor/editor.lua +++ b/editor/editor.lua @@ -20,6 +20,7 @@ local ffi = require("ffi") -- -------------------------------------------------------------------------------------- +local smgr = require("engine.utils.statemanager") local engineState = require("engine.state_engine") -- -------------------------------------------------------------------------------------- @@ -111,6 +112,12 @@ local function input(event) -- Only kick things off once the window is ready. if(event.type == sapp.SAPP_EVENTTYPE_RESIZED) then engineState.ready = true + if(mainState.ctx) then + local w = sapp.sapp_widthf() + local h = sapp.sapp_heightf() + local mainGui = smgr:GetState("mainGui") + mainGui:ReSize(w, h) + end end engineState.input(event, {}) diff --git a/editor/states/mainGui.lua b/editor/states/mainGui.lua index 95a8fb4..8ed8185 100644 --- a/editor/states/mainGui.lua +++ b/editor/states/mainGui.lua @@ -91,6 +91,14 @@ end ------------------------------------------------------------------------------------------------------------ +function SmainGui:ReSize( w, h ) + package.loaded["data.gui.panels.panels"] = nil + panels = require("data.gui.panels.panels") + panels.windows.panel_master.parent = { size = { w, h } } +end + +------------------------------------------------------------------------------------------------------------ + function SmainGui:Screenshot() self.do_screenshot = true end diff --git a/engine/gui/ui/panels_build.lua b/engine/gui/ui/panels_build.lua index d5ae58a..c7c0840 100644 --- a/engine/gui/ui/panels_build.lua +++ b/engine/gui/ui/panels_build.lua @@ -285,7 +285,7 @@ build.panel = function(ctx) local r = nk.nk_window_get_content_region(ctx) local flags = nk.NK_WINDOW_BORDER - build.curr_tab = wdgts.widget_notebook(ctx, "assets", flags, project_tabs, build.curr_tab, r.h-60, 120) + build.curr_tab = wdgts.widget_notebook(ctx, "assets", flags, project_tabs, build.curr_tab, r.h-80, 120) -- display_section(ctx, "graphics") -- display_section(ctx, "audio") diff --git a/engine/state_engine.lua b/engine/state_engine.lua index e5197f7..883866b 100644 --- a/engine/state_engine.lua +++ b/engine/state_engine.lua @@ -26,6 +26,7 @@ local defaults = { } } +-- This is global - dont freak out. All variables are technically global :) (Live under _G) engineState = {} engineState.queued = {} engineState.events = defaults diff --git a/projects/examples/samples/nuklear_multifont.lua b/projects/examples/samples/nuklear_multifont.lua index 95e2a97..29d9702 100644 --- a/projects/examples/samples/nuklear_multifont.lua +++ b/projects/examples/samples/nuklear_multifont.lua @@ -99,7 +99,7 @@ local function setup_font(ctx) image, fonts[3] = font_loader(atlas, font_path.."ProggyClean.ttf", 18.0, nil) -- Dump the atlas to check it. - stb.stbi_write_png( "samples/font/atlas_font.png", master_img_width[0], master_img_height[0], 4, image, master_img_width[0] * 4) + stb.stbi_write_png( "data/temp/atlas_font.png", master_img_width[0], master_img_height[0], 4, image, master_img_width[0] * 4) -- print(master_img_width[0], master_img_height[0], 4) local nk_img = font_atlas_img(image)