Skip to content

Commit 981b4b8

Browse files
feat: revision 0.0.15 (#7)
1 parent df4275c commit 981b4b8

File tree

4 files changed

+26
-18
lines changed

4 files changed

+26
-18
lines changed

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"funding": "https://github.com/sponsors/RodrigoDornelles",
77
"bugs": "https://github.com/gamelly/gly-ide/issues",
88
"devDependencies": {
9-
"@gamely/core-native-html5": "^0.0.10",
10-
"@gamely/gly-engine": "^0.0.10",
9+
"@gamely/core-native-html5": "^0.0.15",
10+
"@gamely/gly-engine-lite": "^0.0.15",
1111
"copy-webpack-plugin": "11.0.0",
1212
"css-loader": "6.7.3",
1313
"html-webpack-plugin": "5.5.0",

src/default.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
std.draw.clear(std.color.blue)
22
std.draw.color(std.color.white)
3-
std.draw.font(48)
4-
std.draw.text(8 , 8, 'Hello world!')
3+
std.text.font_size(std.app.width/8)
4+
std.text.print(8 , 8, 'Hello world!')

src/index.html

+4-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
66
<meta charset="UTF-8" />
77
<meta name="description" content="Tente Lua online" />
8-
<link rel="icon" type="image/png" href="./assets/logo.png" />
9-
<title>IDE - Gly Game Engine</title>
8+
<link rel="icon" type="image/png" href="./assets/logo-gly.png" />
9+
<title>Gly Image Generator</title>
1010
<link rel="preload" href="/assets/CascadiaMono.ttf" as="font" type="font/ttf" crossorigin />
1111
<style>
1212
@font-face {
@@ -30,8 +30,10 @@ <h1>tool-img-gen</h1>
3030
<div id="buttons">
3131
<form>
3232
<select id="resolution" name="resolution">
33+
<option value="48x48">32x32</option>
3334
<option value="48x48">48x48</option>
3435
<option value="80x80">80x80</option>
36+
<option value="128x128">128x48</option>
3537
<option value="128x128">128x128</option>
3638
<option value="256x256">256x256</option>
3739
<option value="512x512" selected>512x512</option>

src/index.js

+18-12
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import wasmFile from 'wasmoon/dist/glue.wasm';
22
import { LuaFactory, LuaMultiReturn } from 'wasmoon'
33
import { editor } from 'monaco-editor'
44
import gly from '@gamely/core-native-html5'
5-
import gly_engine from '@gamely/gly-engine/dist/main.lua'
5+
import gly_engine from '@gamely/gly-engine-lite/dist/main.lua'
66
import defaultScript from './default.lua'
77

88
let monacoTimeout;
@@ -30,11 +30,6 @@ document.addEventListener('DOMContentLoaded', async () => {
3030
const lua = await factory.createEngine()
3131
await lua.doString(gly_engine)
3232

33-
gly.global.set('native_callback_init', lua.global.get('native_callback_init'))
34-
gly.global.set('native_callback_loop', lua.global.get('native_callback_loop'))
35-
gly.global.set('native_callback_draw', lua.global.get('native_callback_draw'))
36-
gly.global.set('native_callback_resize', lua.global.get('native_callback_resize'))
37-
gly.global.set('native_callback_keyboard', lua.global.get('native_callback_keyboard'))
3833
lua.global.set('native_draw_start', gly.global.get('native_draw_start'))
3934
lua.global.set('native_draw_flush', gly.global.get('native_draw_flush'))
4035
lua.global.set('native_draw_clear', gly.global.get('native_draw_clear'))
@@ -46,19 +41,30 @@ document.addEventListener('DOMContentLoaded', async () => {
4641
lua.global.set('native_dict_http', gly.global.get('native_dict_http'))
4742
lua.global.set('native_dict_json', gly.global.get('native_dict_json'))
4843
lua.global.set('native_dict_poly', gly.global.get('native_dict_poly'))
49-
lua.global.set('native_draw_text', (x, y, text) => {
50-
const native_draw_text = gly.global.get('native_draw_text')
44+
lua.global.set('native_text_print', gly.global.get('native_text_print'))
45+
lua.global.set('native_text_font_size', gly.global.get('native_text_font_size'))
46+
lua.global.set('native_text_font_name', gly.global.get('native_text_font_name'))
47+
lua.global.set('native_text_font_default', gly.global.get('native_text_font_default'))
48+
lua.global.set('native_text_font_previous', gly.global.get('native_text_font_previous'))
49+
lua.global.set('native_text_mensure', (x, y, text) => {
50+
const native_draw_text = gly.global.get('native_text_mensure')
5151
return LuaMultiReturn.from(native_draw_text(x, y, text))
5252
})
5353

54+
await lua.doString(gly_engine)
55+
56+
gly.global.set('native_callback_init', lua.global.get('native_callback_init'))
57+
gly.global.set('native_callback_loop', lua.global.get('native_callback_loop'))
58+
gly.global.set('native_callback_draw', lua.global.get('native_callback_draw'))
59+
gly.global.set('native_callback_resize', lua.global.get('native_callback_resize'))
60+
5461
gly.error('canvas')
55-
gly.init('#gameCanvas')
62+
gly.init(elCanvas)
5663

5764
const apply = () => {
5865
const code = monacoEditor.getValue()
59-
gly.load(`return {draw=function(std)\nprint('oi')\n${code}\nend}`)
60-
elCanvas.width = elInpWidth.value;
61-
elCanvas.height= elInpHeight.value;
66+
gly.load(`return {init=function()end,loop=function()end,draw=function(std)\n${code}\nend}`)
67+
gly.resize(elInpWidth.value, elInpHeight.value)
6268
window.requestAnimationFrame(gly.update)
6369
}
6470

0 commit comments

Comments
 (0)