*直接渲染字符串

1 files changed, 13 insertions, 46 deletions

diff --git a/bin/main.lua b/bin/main.lua
index 2a9ee22..66fd4ba 100644
--- a/bin/main.lua
+++ b/bin/main.lua
@@ -1,59 +1,26 @@
 io.stdout:setvbuf("no")
-local shader
-local img
-local img2
-local canvas
-local sw, sh = jin.graphics.getSize()
-local page
-local font
 
+local shader 
+local text
+local page
+local tf
 function jin.core.onLoad()
-    local str = jin.filesystem.read("metaball.shader")
-    shader = jin.graphics.newShader(str)
-    local w, h = 256, 240
-	local bitmap = jin.graphics.newBitmap(w, h, {255, 0, 255, 255})
-	local b = bitmap:clone()
-	bitmap = nil
-	local bitmap2 = jin.graphics.newBitmap("img2.bmp")
-    img2 = jin.graphics.newTexture(b)
-    img = jin.graphics.newTexture(bitmap2)
-    canvas = jin.graphics.newCanvas(200, 100)
-	
-	local fontdata = jin.graphics.newFontData("font.ttf")
-	font = fontdata:newFont(15)
-	local str = jin.filesystem.read("text.txt")
-	page = font:typeset(str, 17, 0)
-	fontdata = nil
+	local font_shader = jin.filesystem.read("font.shader")
+	shader = jin.graphics.newShader(font_shader)
+	local bitmap = jin.graphics.newBitmap("font2.png")
+	local tfdata = jin.graphics.newTTFData("font.ttf")
+	tf = tfdata:newTTF(15)
+	page = tf:typeset("this is a test", 16)
 end
--- extern vec3 iResolution;
--- extern number iGlobalTime;
--- extern vec4 iMouse;
-local mx, my = 0, 0
+
 function jin.core.onEvent(e)
     if e.type == "Quit" then 
         jin.core.stop()
     end
-    if e.type == "KeyDown" then 
-        if e.key == "Escape" then 
-            jin.core.stop()
-        end
-    end
-    if e.type == "MouseMotion" then 
-        -- if e.button == "left" then 
-            mx = e.x 
-            my = e.y
-        -- end
-    end
 end
 
-local dt = 0
 function jin.core.onDraw()
-    dt = dt + 0.1
-	--jin.graphics.useShader(shader)
-	-- jin.graphics.unuseShader()
 	jin.graphics.useShader(shader)
-	shader:sendNumber("dt", dt)
-    --jin.graphics.draw(canvas, 0, 0, 2, 2)
-    font:print(page, 0, 0)
-	-- jin.graphics.unuseShader()
+	jin.graphics.print("this is a test", tf, 10, 10, 16)
+	jin.graphics.unuseShader()
 end
\ No newline at end of file