更改profile开启方式,和计算器组合功能键不冲突了

This commit is contained in:
MrZ626
2020-10-24 20:07:30 +08:00
parent a7435eb844
commit 9336534566
2 changed files with 20 additions and 17 deletions

View File

@@ -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

View File

@@ -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