diff --git a/Zframework/init.lua b/Zframework/init.lua index 4f7a140f..a13c1fb5 100644 --- a/Zframework/init.lua +++ b/Zframework/init.lua @@ -191,27 +191,16 @@ end function love.keypressed(i) mouseShow=false if devMode then - if i=="1"then - print("profile start!") - PROFILE.start() - elseif i=="2"then - print("profile stop!") - PROFILE.stop() - elseif i=="3"then - print("profile report copied!") - love.system.setClipboardText(PROFILE.report()) - elseif i=="4"then - print("profile resetted!") - PROFILE.reset() - elseif i=="f1"then - local r=rnd()<.5 - love._setGammaCorrect(r) - LOG.print("GammaCorrect: "..(r and"on"or"off"),"warn") + if i=="f1"then + PROFILE.switch() elseif i=="f2"then LOG.print("System:"..SYSTEM.."["..jit.arch.."]") LOG.print("luaVer:".._VERSION) LOG.print("jitVer:"..jit.version) LOG.print("jitVerNum:"..jit.version_num) + local r=rnd()<.5 + love._setGammaCorrect(r) + LOG.print("GammaCorrect: "..(r and"on"or"off"),"warn") elseif i=="f3"then for _=1,8 do local P=PLAYERS.alive[rnd(#PLAYERS.alive)] @@ -220,7 +209,7 @@ function love.keypressed(i) P:lose() end end - elseif i=="f4"then LOG.copy() + elseif i=="f4"then if not kb.isDown("lalt","ralt")then LOG.copy()end elseif i=="f5"then if love._openConsole then love._openConsole()end elseif i=="f6"then if WIDGET.sel then DBP(WIDGET.sel)end elseif i=="f7"then for k,v in next,_G do DBP(k,v)end diff --git a/Zframework/profile.lua b/Zframework/profile.lua index f08bbcd8..ca1bba63 100644 --- a/Zframework/profile.lua +++ b/Zframework/profile.lua @@ -166,6 +166,20 @@ function profile.report(n) return '\n'..sz..row end +local switch=false +function profile.switch() + if switch then + profile.stop() + love.system.setClipboardText(PROFILE.report()) + PROFILE.reset() + LOG.print("profile report copied!") + else + PROFILE.start() + LOG.print("profile start!") + end + switch=not switch +end + -- store all internal profiler functions for _, v in next,profile do if type(v) == "function" then