From 9c51cdf13469ead930b46b3a7d0787f77d365c9c Mon Sep 17 00:00:00 2001 From: chai Date: Sat, 8 Sep 2018 15:51:18 +0800 Subject: *update --- bin/Jin.exe | Bin 552960 -> 1419776 bytes bin/jin.exe | Bin 552960 -> 1419776 bytes bin/main.lua | 4 ++-- build/vc++/jin.vcxproj | 14 ++++++------ build/vc++/jin.vcxproj.filters | 48 ++++++++++++++++++++--------------------- 5 files changed, 33 insertions(+), 33 deletions(-) diff --git a/bin/Jin.exe b/bin/Jin.exe index 992aa75..21152e0 100644 Binary files a/bin/Jin.exe and b/bin/Jin.exe differ diff --git a/bin/jin.exe b/bin/jin.exe index 992aa75..21152e0 100644 Binary files a/bin/jin.exe and b/bin/jin.exe differ diff --git a/bin/main.lua b/bin/main.lua index a8663f6..e98eb39 100644 --- a/bin/main.lua +++ b/bin/main.lua @@ -43,8 +43,8 @@ function jin.core.onDraw() jin.graphics.bindCanvas(canvas) jin.graphics.useShader(shader) shader:sendNumber("iGlobalTime", dt ) - shader:sendVec3("iResolution", sw, sh, 1) - shader:sendVec4("iMouse", mx, my, mx, my) + shader:sendVec3("iResolution", {sw, sh, 1}) + shader:sendVec4("iMouse", {mx, my, mx, my}) jin.graphics.draw(img, 0, 0, 1, 1) jin.graphics.unuseShader() jin.graphics.unbindCanvas() diff --git a/build/vc++/jin.vcxproj b/build/vc++/jin.vcxproj index 2fd6086..851f3a7 100644 --- a/build/vc++/jin.vcxproj +++ b/build/vc++/jin.vcxproj @@ -175,18 +175,18 @@ - - - - - - - + + + + + + + diff --git a/build/vc++/jin.vcxproj.filters b/build/vc++/jin.vcxproj.filters index b4dc913..c8397b5 100644 --- a/build/vc++/jin.vcxproj.filters +++ b/build/vc++/jin.vcxproj.filters @@ -58,12 +58,12 @@ {5b69329e-0aa2-4c77-be52-69c09fdbac65} - - {cb6d9d4e-046b-44c7-b00a-c316e87e035c} - {0340fbad-0c07-4923-afd2-183424c70967} + + {cb6d9d4e-046b-44c7-b00a-c316e87e035c} + @@ -155,24 +155,6 @@ src\common - - src\modules\embed - - - src\modules\embed - - - src\modules\embed - - - src\modules\embed - - - src\modules\embed - - - src\modules\embed - src\modules\net @@ -191,9 +173,6 @@ src\modules - - src\modules\embed - src @@ -203,6 +182,27 @@ src\modules + + src\modules\_embed + + + src\modules\_embed + + + src\modules\_embed + + + src\modules\_embed + + + src\modules\_embed + + + src\modules\_embed + + + src\modules\_embed + -- cgit v1.1-26-g67d0