diff options
| -rw-r--r-- | bin/client/config.lua | 8 | ||||
| -rw-r--r-- | bin/client/main.lua | 49 | ||||
| -rw-r--r-- | bin/jin.exe | bin | 807424 -> 1662976 bytes | |||
| -rw-r--r-- | bin/main.lua | 2 | ||||
| -rw-r--r-- | build/vs2015/jin.rc | bin | 3330 -> 3268 bytes | |||
| -rw-r--r-- | src/lua/net/luaopen_net.cpp | 1 |
6 files changed, 58 insertions, 2 deletions
diff --git a/bin/client/config.lua b/bin/client/config.lua new file mode 100644 index 0000000..3e696b8 --- /dev/null +++ b/bin/client/config.lua @@ -0,0 +1,8 @@ +return +{ + width = 512, + height = 400, + fullscreen = false, + resizable = true, + title = "Jin Modules" +} diff --git a/bin/client/main.lua b/bin/client/main.lua new file mode 100644 index 0000000..df33e21 --- /dev/null +++ b/bin/client/main.lua @@ -0,0 +1,49 @@ +io.stdout:setvbuf("no") +local thread = nil +local socket = nil +local asynReceive = [[ +io.stdout:setvbuf("no") +local thread = jin.thread.getThread() +local socket = thread:demand(1) +while true do + -- local sendBuf = thread:demand(3) + -- socket:send(sendBuf) + local buf = socket:receive() + thread:send(2, buf) +end +]] +local x = 30 +local y = 30 +jin.core.onLoad = function() + thread = jin.thread.Thread("asynReceive", asynReceive) + jin.net.init() + socket = jin.net.Socket("TCP", "127.0.0.1", 8809) + thread:start() + thread:send(1, socket) +end + +jin.core.onEvent = function(e) + if e.type == "quit" then + jin.core.stop() elseif e.type == "keydown" then + if e.key == "Escape" then + jin.core.stop() + end + end +end +local i = 0 +jin.core.onUpdate = function(dt) + if thread:receive(2) then + local buf = thread:fetch(2) + x, xl = buf:grabFloat(0) + y, yl = buf:grabFloat(xl) + end + + -- local buf = jin.net.Buffer(0) + -- buf:append(x) + -- buf:append(y) + -- thread:send(3, buf) +end + +jin.core.onDraw = function() + jin.graphics.circle("fill", x, y, 12) +end
\ No newline at end of file diff --git a/bin/jin.exe b/bin/jin.exe Binary files differindex a59b492..a2db2ab 100644 --- a/bin/jin.exe +++ b/bin/jin.exe diff --git a/bin/main.lua b/bin/main.lua index 3480016..b7f7124 100644 --- a/bin/main.lua +++ b/bin/main.lua @@ -1,3 +1,3 @@ -require "jin-modules.main" +require "client.main" diff --git a/build/vs2015/jin.rc b/build/vs2015/jin.rc Binary files differindex d452afb..6fcc3a7 100644 --- a/build/vs2015/jin.rc +++ b/build/vs2015/jin.rc diff --git a/src/lua/net/luaopen_net.cpp b/src/lua/net/luaopen_net.cpp index e2b9a9a..89a79f3 100644 --- a/src/lua/net/luaopen_net.cpp +++ b/src/lua/net/luaopen_net.cpp @@ -80,7 +80,6 @@ namespace lua extern int luaopen_Socket(lua_State* L); extern int luaopen_Buffer(lua_State* L); - // only tcp int luaopen_net(lua_State* L) { luaopen_Socket(L); |