From 8ca05bbb436a5c4c4bbbe0a00fb6b8b1f6602e43 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Sat, 27 Mar 2021 22:43:45 +0800
Subject: [PATCH] =?UTF-8?q?ws=E7=8A=B6=E6=80=81=E5=8F=AA=E5=9C=A8debug?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Zframework/init.lua | 47 +++++++++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/Zframework/init.lua b/Zframework/init.lua
index 92152c92..bf2d66fc 100644
--- a/Zframework/init.lua
+++ b/Zframework/init.lua
@@ -557,27 +557,6 @@ function love.run()
 					_.draw(_.time)
 				end
 
-				--Draw network working status
-				gc_push("transform")
-				gc.translate(SCR.w,0)
-				gc.scale(SCR.k)
-				for i=1,5 do
-					local status=WS.status(WSnames[i])
-					gc_setColor(WScolor[i])
-					gc_rectangle("fill",0,20*i,-20,-20)
-					if status=="dead"then
-						gc_setColor(.8,.8,.8)
-						gc_draw(TEXTURE.ws_dead,-20,20*i-20)
-					elseif status=="connecting"then
-						gc_setColor(.8,.8,.8,.5+.3*sin(t*6.26))
-						gc_draw(TEXTURE.ws_connecting,-20,20*i-20)
-					elseif status=="running"then
-						gc_setColor(.8,.8,.8)
-						gc_draw(TEXTURE.ws_running,-20,20*i-20)
-					end
-				end
-				gc_pop()
-
 				--Draw FPS
 				gc_setColor(1,1,1)
 				setFont(15)
@@ -586,17 +565,43 @@ function love.run()
 
 				--Debug info.
 				if devMode then
+					--Left-down infos
 					gc_setColor(devColor[devMode])
 					gc_print("MEM     "..gcinfo(),SCR.safeX+5,_-40)
 					gc_print("Lines    "..FREEROW.getCount(),SCR.safeX+5,_-60)
 					gc_print("Cursor  "..int(mx+.5).." "..int(my+.5),SCR.safeX+5,_-80)
 					gc_print("Voices  "..VOC.getQueueCount(),SCR.safeX+5,_-100)
 					gc_print("Tasks   "..TASK.getCount(),SCR.safeX+5,_-120)
+
+					--Update & draw frame time
 					ins(frameTimeList,1,dt)rem(frameTimeList,126)
 					gc_setColor(1,1,1,.3)
 					for i=1,#frameTimeList do
 						gc_rectangle("fill",150+2*i,_-20,2,-frameTimeList[i]*4000)
 					end
+
+					--Websocket status
+					gc_push("transform")
+					gc.translate(SCR.w,0)
+					gc.scale(SCR.k)
+					for i=1,5 do
+						local status=WS.status(WSnames[i])
+						gc_setColor(WScolor[i])
+						gc_rectangle("fill",0,20*i,-20,-20)
+						if status=="dead"then
+							gc_setColor(.8,.8,.8)
+							gc_draw(TEXTURE.ws_dead,-20,20*i-20)
+						elseif status=="connecting"then
+							gc_setColor(.8,.8,.8,.5+.3*sin(t*6.26))
+							gc_draw(TEXTURE.ws_connecting,-20,20*i-20)
+						elseif status=="running"then
+							gc_setColor(.8,.8,.8)
+							gc_draw(TEXTURE.ws_running,-20,20*i-20)
+						end
+					end
+					gc_pop()
+
+					--Slow devmode
 					if devMode==3 then WAIT(.1)
 					elseif devMode==4 then WAIT(.5)
 					end