From b05c2fc91138fc6a4f522ad9804da66542c99090 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Wed, 11 Dec 2024 14:08:24 +0300 Subject: [PATCH] fix 'timeit' in headless mode --- dev/tests/example.lua | 3 ++- res/scripts/stdlib.lua | 1 + res/scripts/stdmin.lua | 4 ++-- src/logic/scripting/lua/libs/libtime.cpp | 1 - 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dev/tests/example.lua b/dev/tests/example.lua index 4c4c2e5d..6262e369 100644 --- a/dev/tests/example.lua +++ b/dev/tests/example.lua @@ -1,6 +1,7 @@ test.new_world("demo", "2019", "core:default") +assert(world.is_open()) assert(world.get_generator() == "core:default") -coroutine.yield() +test.sleep(1) assert(world.get_total_time() > 0.0) print(world.get_total_time()) test.close_world(true) diff --git a/res/scripts/stdlib.lua b/res/scripts/stdlib.lua index 3687d6fc..a732fde6 100644 --- a/res/scripts/stdlib.lua +++ b/res/scripts/stdlib.lua @@ -15,6 +15,7 @@ if test then test.new_world = core.new_world test.close_world = core.close_world test.reconfig_packs = core.reconfig_packs + test.tick = coroutine.yield end ------------------------------------------------ diff --git a/res/scripts/stdmin.lua b/res/scripts/stdmin.lua index 14479c7d..49ddec00 100644 --- a/res/scripts/stdmin.lua +++ b/res/scripts/stdmin.lua @@ -34,11 +34,11 @@ end function timeit(iters, func, ...) - local tm = time.uptime() + local tm = os.clock() for i=1,iters do func(...) end - print("[time mcs]", (time.uptime()-tm) * 1000000) + print("[time mcs]", (os.clock()-tm) * 1000000) end ---------------------------------------------- diff --git a/src/logic/scripting/lua/libs/libtime.cpp b/src/logic/scripting/lua/libs/libtime.cpp index daac093f..78952ede 100644 --- a/src/logic/scripting/lua/libs/libtime.cpp +++ b/src/logic/scripting/lua/libs/libtime.cpp @@ -1,5 +1,4 @@ #include "engine.hpp" -#include "window/Window.hpp" #include "api_lua.hpp" using namespace scripting;