Fix engine message ot displaying correctly on the screen.

minigdx · Mar 18, 2024 · d105f6c · d105f6c
1 parent 86c3ddc
commit d105f6c
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git a/tiny-doc/src/docs/asciidoc/sample/_engine.lua b/tiny-doc/src/docs/asciidoc/sample/_engine.lua
@@ -23,8 +23,10 @@ function popup(logo, text, color, keep)
 end
 
 function printDebug(index, text, color)
+    local prev = gfx.camera()
     shape.rectf(0, index * 6, #text * 6 + 6, 6, color)
     print(text, 6, index * 6 + 1, "#FFFFFF")
+    gfx.camera(prev.x, prev.y)
 end
 
 function clear()
@@ -40,8 +42,9 @@ end
 
 function _draw()
     if forever or dt > 0 then
+        local prev = gfx.camera()
         shape.rectf(0, 0, width, 6 * msg.lines, msg.color)
-        -- TODO: display the logo
         print(msg.text, 6, 1, "#FFFFFF")
+        gfx.camera(prev.x, prev.y)
     end
 end
diff --git a/tiny-engine/src/commonMain/kotlin/com/github/minigdx/tiny/lua/GfxLib.kt b/tiny-engine/src/commonMain/kotlin/com/github/minigdx/tiny/lua/GfxLib.kt
@@ -134,14 +134,23 @@ class GfxLib(private val resourceAccess: GameResourceAccess) : TwoArgFunction()
 
         @TinyCall("Reset the game camera to it's default position (0,0).")
         override fun call(): LuaValue {
+            val previous = coordinates()
             resourceAccess.frameBuffer.camera.set(0, 0)
-            return NONE
+            return previous
         }
 
         @TinyCall("Set game camera to the position x, y.")
         override fun call(@TinyArg("x") arg1: LuaValue, @TinyArg("y") arg2: LuaValue): LuaValue {
+            val previous = coordinates()
             resourceAccess.frameBuffer.camera.set(arg1.toint(), arg2.toint())
-            return NONE
+            return previous
+        }
+
+        private fun coordinates(): LuaTable {
+            return LuaTable().apply {
+                set("x", resourceAccess.frameBuffer.camera.x)
+                set("y", resourceAccess.frameBuffer.camera.y)
+            }
         }
     }
 

diff --git a/tiny-engine/src/commonMain/resources/_engine.lua b/tiny-engine/src/commonMain/resources/_engine.lua
@@ -23,8 +23,10 @@ function popup(logo, text, color, keep)
 end
 
 function printDebug(index, text, color)
+    local prev = gfx.camera()
     shape.rectf(0, index * 6, #text * 6 + 6, 6, color)
     print(text, 6, index * 6 + 1, "#FFFFFF")
+    gfx.camera(prev.x, prev.y)
 end
 
 function clear()
@@ -40,8 +42,9 @@ end
 
 function _draw()
     if forever or dt > 0 then
+        local prev = gfx.camera()
         shape.rectf(0, 0, width, 6 * msg.lines, msg.color)
-        -- TODO: display the logo
         print(msg.text, 6, 1, "#FFFFFF")
+        gfx.camera(prev.x, prev.y)
     end
 end
diff --git a/tiny-web-editor/src/jsMain/resources/_engine.lua b/tiny-web-editor/src/jsMain/resources/_engine.lua
@@ -23,8 +23,10 @@ function popup(logo, text, color, keep)
 end
 
 function printDebug(index, text, color)
+    local prev = gfx.camera()
     shape.rectf(0, index * 6, #text * 6 + 6, 6, color)
     print(text, 6, index * 6 + 1, "#FFFFFF")
+    gfx.camera(prev.x, prev.y)
 end
 
 function clear()
@@ -40,8 +42,9 @@ end
 
 function _draw()
     if forever or dt > 0 then
+        local prev = gfx.camera()
         shape.rectf(0, 0, width, 6 * msg.lines, msg.color)
-        -- TODO: display the logo
         print(msg.text, 6, 1, "#FFFFFF")
+        gfx.camera(prev.x, prev.y)
     end
 end