diff options
Diffstat (limited to 'src/libjin-lua/embed/scripts')
-rw-r--r-- | src/libjin-lua/embed/scripts/ai.lua | 19 | ||||
-rw-r--r-- | src/libjin-lua/embed/scripts/ai.lua.h | 26 | ||||
-rw-r--r-- | src/libjin-lua/embed/scripts/boot.lua | 5 | ||||
-rw-r--r-- | src/libjin-lua/embed/scripts/boot.lua.h | 139 | ||||
-rw-r--r-- | src/libjin-lua/embed/scripts/graphics.lua | 5 | ||||
-rw-r--r-- | src/libjin-lua/embed/scripts/graphics.lua.h | 139 | ||||
-rw-r--r-- | src/libjin-lua/embed/scripts/keyboard.lua | 3 | ||||
-rw-r--r-- | src/libjin-lua/embed/scripts/keyboard.lua.h | 17 | ||||
-rw-r--r-- | src/libjin-lua/embed/scripts/mouse.lua | 4 | ||||
-rw-r--r-- | src/libjin-lua/embed/scripts/mouse.lua.h | 16 | ||||
-rw-r--r-- | src/libjin-lua/embed/scripts/net.lua | 5 | ||||
-rw-r--r-- | src/libjin-lua/embed/scripts/net.lua.h | 7 | ||||
-rw-r--r-- | src/libjin-lua/embed/scripts/path.lua | 5 | ||||
-rw-r--r-- | src/libjin-lua/embed/scripts/path.lua.h | 16 |
14 files changed, 6 insertions, 400 deletions
diff --git a/src/libjin-lua/embed/scripts/ai.lua b/src/libjin-lua/embed/scripts/ai.lua index a69da84..c9f6ff1 100644 --- a/src/libjin-lua/embed/scripts/ai.lua +++ b/src/libjin-lua/embed/scripts/ai.lua @@ -1,5 +1,4 @@ -/* graphics.lua */ -static const char* ai_lua = R"( + jin.ai = jin.ai or {} local ja = jin.ai @@ -8,19 +7,3 @@ ja.StateMachineType = { STEPWISE = 1, ITERATIVE = 2, } - - - -)"; - - -//local sp = jin.graphics.newSprite() -//local sm = jin.ai.newStateMachine(jin.StateMachineMode.STEPWISE, sp) -//sm:addState("run") -//sm:addEnterCallback("run", function(spr) -// spr:setRun() -//end) -// -//function jin.core.onUpdate(dt) -// sm:update() -//end diff --git a/src/libjin-lua/embed/scripts/ai.lua.h b/src/libjin-lua/embed/scripts/ai.lua.h deleted file mode 100644 index a69da84..0000000 --- a/src/libjin-lua/embed/scripts/ai.lua.h +++ /dev/null @@ -1,26 +0,0 @@ -/* graphics.lua */ -static const char* ai_lua = R"( -jin.ai = jin.ai or {} - -local ja = jin.ai - -ja.StateMachineType = { - STEPWISE = 1, - ITERATIVE = 2, -} - - - -)"; - - -//local sp = jin.graphics.newSprite() -//local sm = jin.ai.newStateMachine(jin.StateMachineMode.STEPWISE, sp) -//sm:addState("run") -//sm:addEnterCallback("run", function(spr) -// spr:setRun() -//end) -// -//function jin.core.onUpdate(dt) -// sm:update() -//end diff --git a/src/libjin-lua/embed/scripts/boot.lua b/src/libjin-lua/embed/scripts/boot.lua index 4b97b69..cfcf264 100644 --- a/src/libjin-lua/embed/scripts/boot.lua +++ b/src/libjin-lua/embed/scripts/boot.lua @@ -1,5 +1,4 @@ -/* boot.lua */ -static const char* boot_lua = R"( + local cwd = jin.args['cwd'] or '.' jin.filesystem.init() jin.filesystem.mount(cwd) @@ -135,5 +134,3 @@ jin.audio.destroy() ------------------------------------------------------------------------- jin.core.quit() - -)";
\ No newline at end of file diff --git a/src/libjin-lua/embed/scripts/boot.lua.h b/src/libjin-lua/embed/scripts/boot.lua.h deleted file mode 100644 index 4b97b69..0000000 --- a/src/libjin-lua/embed/scripts/boot.lua.h +++ /dev/null @@ -1,139 +0,0 @@ -/* boot.lua */ -static const char* boot_lua = R"( -local cwd = jin.args['cwd'] or '.' -jin.filesystem.init() -jin.filesystem.mount(cwd) - -------------------------------------------------------------------------- --- Config game -------------------------------------------------------------------------- - -jin.config = {} -if jin.filesystem.exist("config.lua") then - xpcall(function()jin.config = require "config" end, function()end) -end -jin.config.width = jin.config.width or 580 -jin.config.height = jin.config.height or 450 -jin.config.vsync = jin.config.vsync or true -jin.config.title = jin.config.title or ("jin v" .. jin.version) -jin.config.resizable = jin.config.resizable or false -jin.config.fullscreen = jin.config.fullscreen or false -jin.config.fps = jin.config.fps or 60 -jin.config.icon = jin.config.icon or "" - -------------------------------------------------------------------------- --- Default game loop -------------------------------------------------------------------------- - -local function call(func, ...) - if func then - return func(...) - end -end - -local step = jin.time.step -jin.time.step = nil - -function jin.core.run() - jin.graphics.reset() - call(jin.core.onLoad) - local dt = 0 - while jin.core.running() do - for _, e in pairs(jin.event.poll()) do - if e.type == "KeyDown" then - jin.keyboard.set(e.key, true) - elseif e.type == "KeyUp" then - jin.keyboard.set(e.key, false) - end - call(jin.core.onEvent, e) - end - step() - dt = jin.time.getDelta() - call(jin.core.onUpdate, dt) - jin.graphics.clear() - call(jin.core.onDraw) - jin.graphics.present() - jin.time.sleep(0.001) - end -end - -------------------------------------------------------------------------- --- Boot game -------------------------------------------------------------------------- - --- Display error message. -local function onError(msg) - jin.audio.destroy() - jin.graphics.showWindow() - local err = "Error:\n" .. msg .. "\n" .. debug.traceback() - jin.graphics.reset() - jin.graphics.setClearColor(100, 100, 100, 255) - jin.graphics.clear() - jin.graphics.print(err, 5, 5) - jin.graphics.present() - while jin.core.running() do - for _, e in pairs(jin.event.poll()) do - if e.type == "Quit" then - jin.core.stop() - end - end - jin.time.sleep(0.001) - end -end - --- No game screen. -local function noGame() - jin.graphics.showWindow() - jin.graphics.reset() - jin.graphics.setClearColor(100, 100, 100, 255) - jin.graphics.clear() - jin.graphics.print("No Game", 5, 5) - jin.graphics.present() - while jin.core.running() do - for _, e in pairs(jin.event.poll()) do - if e.type == "Quit" then - jin.core.stop() - end - end - jin.time.sleep(0.001) - end -end - -local function boot() - if jin.filesystem.exist("main.lua") then - call(function() - require"main" - jin.core.run() - end) - else - noGame() - end -end - -------------------------------------------------------------------------- --- Initialize sub systems -------------------------------------------------------------------------- - -jin.audio.init() -jin.graphics.init(jin.config) - -------------------------------------------------------------------------- --- Boot game -------------------------------------------------------------------------- - -xpcall(boot, onError) - -------------------------------------------------------------------------- --- Destroy sub-systems -------------------------------------------------------------------------- - -jin.graphics.destroy() -jin.audio.destroy() - -------------------------------------------------------------------------- --- Quit game -------------------------------------------------------------------------- - -jin.core.quit() - -)";
\ No newline at end of file diff --git a/src/libjin-lua/embed/scripts/graphics.lua b/src/libjin-lua/embed/scripts/graphics.lua index 0a66127..41c481c 100644 --- a/src/libjin-lua/embed/scripts/graphics.lua +++ b/src/libjin-lua/embed/scripts/graphics.lua @@ -1,5 +1,4 @@ -/* graphics.lua */ -static const char* graphics_lua = R"( + jin.graphics = jin.graphics or {} local jg = jin.graphics @@ -135,5 +134,3 @@ jg.reset = function() jg.unsetFont() jg.unuseShader() end - -)";
\ No newline at end of file diff --git a/src/libjin-lua/embed/scripts/graphics.lua.h b/src/libjin-lua/embed/scripts/graphics.lua.h deleted file mode 100644 index 0a66127..0000000 --- a/src/libjin-lua/embed/scripts/graphics.lua.h +++ /dev/null @@ -1,139 +0,0 @@ -/* graphics.lua */ -static const char* graphics_lua = R"( -jin.graphics = jin.graphics or {} - -local jg = jin.graphics - -jg.RenderMode = { - FILL = 1, - LINE = 2, -} - -jg.SpriteOrigin = { - TOPLEFT = 0, - TOPCENTER = 1, - TOPRIGHT = 2, - MIDDLELEFT = 3, - MIDDLECENTER = 4, - MIDDLERIGHT = 5, - BOTTOMLEFT = 6, - BOTTOMCENTER = 7, - BOTTOMRIGHT = 8 -} - -jg.SpriteMode = { - SINGLE = 1, - RANDOM = 2, - ANIMATED = 3 -} - --- built in shaders -jg.Shaders = { - Font = nil, - Texture = nil, - Sprite = nil, - SpriteSheet = nil, - Default = nil -} - -local function compileBuiltInShaders() - jg.Shaders.Font = jg.newShader([[ - #VERTEX_SHADER - Vertex vert(Vertex v) - { - return v; - } - #END_VERTEX_SHADER - #FRAGMENT_SHADER - Color frag(Color col, Texture tex, Vertex v) - { - return Color(col.rgb, texel(tex, v.uv).a); - } - #END_FRAGMENT_SHADER - ]]) - jg.Shaders.Texture = jg.newShader([[ - #VERTEX_SHADER - Vertex vert(Vertex v) - { - return v; - } - #END_VERTEX_SHADER - #FRAGMENT_SHADER - Color frag(Color col, Texture tex, Vertex v) - { - return col * texel(tex, v.uv); - } - #END_FRAGMENT_SHADER - ]]) - jg.Shaders.Sprite = jg.newShader([[ - #VERTEX_SHADER - Vertex vert(Vertex v) - { - return v; - } - #END_VERTEX_SHADER - #FRAGMENT_SHADER - Color frag(Color col, Texture tex, Vertex v) - { - return col * texel(tex, v.uv); - } - #END_FRAGMENT_SHADER - ]]) - jg.Shaders.SpriteSheet = jg.newShader([[ - #VERTEX_SHADER - Vertex vert(Vertex v) - { - return v; - } - #END_VERTEX_SHADER - #FRAGMENT_SHADER - Color frag(Color col, Texture tex, Vertex v) - { - return col * texel(tex, v.uv); - } - #END_FRAGMENT_SHADER - ]]) - jg.Shaders.Default = jg.newShader([[ - #VERTEX_SHADER - Vertex vert(Vertex v) - { - return v; - } - #END_VERTEX_SHADER - #FRAGMENT_SHADER - Color frag(Color col, Texture tex, Vertex v) - { - return col * texel(tex, v.uv); - } - #END_FRAGMENT_SHADER - ]]) -end - -local _init = jg.init -local initialized = false -jg.init = function(setting) - if initialized then - return initialized - end - initialized = _init(setting) - if initialized then - compileBuiltInShaders() - jg.useShader(jg.Shaders.Default) - end - return initialized -end - -jg.unuseShader = function() - jg.useShader(jg.Shaders.Default) -end - --- Reset all attributes to default value. -jg.reset = function() - jg.setColor(255, 255, 255, 255) - jg.setClearColor(0, 0, 0, 255) - jg.clear() - jg.unsetFont() - jg.unuseShader() -end - -)";
\ No newline at end of file diff --git a/src/libjin-lua/embed/scripts/keyboard.lua b/src/libjin-lua/embed/scripts/keyboard.lua index e989928..452e0f7 100644 --- a/src/libjin-lua/embed/scripts/keyboard.lua +++ b/src/libjin-lua/embed/scripts/keyboard.lua @@ -1,5 +1,4 @@ -static const char* keyboard_lua = R"( jin.keyboard = jin.keyboard or {} local jk = jin.keyboard @@ -13,5 +12,3 @@ end function jin.keyboard.set(k, status) keys[k] = status end - -)"; diff --git a/src/libjin-lua/embed/scripts/keyboard.lua.h b/src/libjin-lua/embed/scripts/keyboard.lua.h deleted file mode 100644 index e989928..0000000 --- a/src/libjin-lua/embed/scripts/keyboard.lua.h +++ /dev/null @@ -1,17 +0,0 @@ - -static const char* keyboard_lua = R"( -jin.keyboard = jin.keyboard or {} - -local jk = jin.keyboard - -local keys = {} - -function jin.keyboard.isPressed(k) - return keys[k] -end - -function jin.keyboard.set(k, status) - keys[k] = status -end - -)"; diff --git a/src/libjin-lua/embed/scripts/mouse.lua b/src/libjin-lua/embed/scripts/mouse.lua index ca070a3..876bf1d 100644 --- a/src/libjin-lua/embed/scripts/mouse.lua +++ b/src/libjin-lua/embed/scripts/mouse.lua @@ -1,4 +1,4 @@ -static const char* mouse_lua = R"( + jin.mouse = jin.mouse or {} local jm = jin.mouse @@ -12,5 +12,3 @@ end function jin.mouse.set(btn, status) button[btn] = status end - -)";
\ No newline at end of file diff --git a/src/libjin-lua/embed/scripts/mouse.lua.h b/src/libjin-lua/embed/scripts/mouse.lua.h deleted file mode 100644 index ca070a3..0000000 --- a/src/libjin-lua/embed/scripts/mouse.lua.h +++ /dev/null @@ -1,16 +0,0 @@ -static const char* mouse_lua = R"( -jin.mouse = jin.mouse or {} - -local jm = jin.mouse - -local button = {} - -function jin.mouse.isDown(btn) - return button[btn] -end - -function jin.mouse.set(btn, status) - button[btn] = status -end - -)";
\ No newline at end of file diff --git a/src/libjin-lua/embed/scripts/net.lua b/src/libjin-lua/embed/scripts/net.lua index a986ce6..946b55f 100644 --- a/src/libjin-lua/embed/scripts/net.lua +++ b/src/libjin-lua/embed/scripts/net.lua @@ -1,7 +1,4 @@ -/* net.lua */ -static const char* net_lua = R"( + jin.net = jin.net or {} local jn = jin.net - -)";
\ No newline at end of file diff --git a/src/libjin-lua/embed/scripts/net.lua.h b/src/libjin-lua/embed/scripts/net.lua.h deleted file mode 100644 index a986ce6..0000000 --- a/src/libjin-lua/embed/scripts/net.lua.h +++ /dev/null @@ -1,7 +0,0 @@ -/* net.lua */ -static const char* net_lua = R"( -jin.net = jin.net or {} - -local jn = jin.net - -)";
\ No newline at end of file diff --git a/src/libjin-lua/embed/scripts/path.lua b/src/libjin-lua/embed/scripts/path.lua index f7e1ec3..ede7f62 100644 --- a/src/libjin-lua/embed/scripts/path.lua +++ b/src/libjin-lua/embed/scripts/path.lua @@ -1,5 +1,4 @@ -/* path.lua */ -static const char* path_lua = R"( + jin.path = jin.path or {} local jp = jin.path @@ -12,5 +11,3 @@ function jin.path.full(path) local root = jin._dir .. '/' .. jin._argv[2] return root .. '/' .. path end - -)";
\ No newline at end of file diff --git a/src/libjin-lua/embed/scripts/path.lua.h b/src/libjin-lua/embed/scripts/path.lua.h deleted file mode 100644 index f7e1ec3..0000000 --- a/src/libjin-lua/embed/scripts/path.lua.h +++ /dev/null @@ -1,16 +0,0 @@ -/* path.lua */ -static const char* path_lua = R"( -jin.path = jin.path or {} - -local jp = jin.path - --- game root directory -jin._root = nil - --- return full path of a given path -function jin.path.full(path) - local root = jin._dir .. '/' .. jin._argv[2] - return root .. '/' .. path -end - -)";
\ No newline at end of file |