aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bin/Jin.exebin552960 -> 1419776 bytes
-rw-r--r--bin/jin.exebin552960 -> 1419776 bytes
-rw-r--r--bin/main.lua4
-rw-r--r--build/vc++/jin.vcxproj14
-rw-r--r--build/vc++/jin.vcxproj.filters48
5 files changed, 33 insertions, 33 deletions
diff --git a/bin/Jin.exe b/bin/Jin.exe
index 992aa75..21152e0 100644
--- a/bin/Jin.exe
+++ b/bin/Jin.exe
Binary files differ
diff --git a/bin/jin.exe b/bin/jin.exe
index 992aa75..21152e0 100644
--- a/bin/jin.exe
+++ b/bin/jin.exe
Binary files 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 @@
<ClInclude Include="..\..\src\lua\common\Proxy.h" />
<ClInclude Include="..\..\src\lua\common\Reference.hpp" />
<ClInclude Include="..\..\src\lua\libraries\luax\luax.h" />
- <ClInclude Include="..\..\src\lua\modules\embed\boot.lua.h" />
- <ClInclude Include="..\..\src\lua\modules\embed\embed.h" />
- <ClInclude Include="..\..\src\lua\modules\embed\graphics.lua.h" />
- <ClInclude Include="..\..\src\lua\modules\embed\keyboard.lua.h" />
- <ClInclude Include="..\..\src\lua\modules\embed\mouse.lua.h" />
- <ClInclude Include="..\..\src\lua\modules\embed\net.lua.h" />
- <ClInclude Include="..\..\src\lua\modules\embed\path.lua.h" />
<ClInclude Include="..\..\src\lua\modules\jin.h" />
<ClInclude Include="..\..\src\lua\modules\luax.h" />
<ClInclude Include="..\..\src\lua\modules\net\Buffer.h" />
<ClInclude Include="..\..\src\lua\modules\thread\thread.h" />
<ClInclude Include="..\..\src\lua\modules\types.h" />
+ <ClInclude Include="..\..\src\lua\modules\_embed\boot.lua.h" />
+ <ClInclude Include="..\..\src\lua\modules\_embed\embed.h" />
+ <ClInclude Include="..\..\src\lua\modules\_embed\graphics.lua.h" />
+ <ClInclude Include="..\..\src\lua\modules\_embed\keyboard.lua.h" />
+ <ClInclude Include="..\..\src\lua\modules\_embed\mouse.lua.h" />
+ <ClInclude Include="..\..\src\lua\modules\_embed\net.lua.h" />
+ <ClInclude Include="..\..\src\lua\modules\_embed\path.lua.h" />
<ClInclude Include="..\..\src\lua\resources\font.ttf.h" />
<ClInclude Include="resource.h" />
</ItemGroup>
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 @@
<Filter Include="src\modules\mouse">
<UniqueIdentifier>{5b69329e-0aa2-4c77-be52-69c09fdbac65}</UniqueIdentifier>
</Filter>
- <Filter Include="src\modules\embed">
- <UniqueIdentifier>{cb6d9d4e-046b-44c7-b00a-c316e87e035c}</UniqueIdentifier>
- </Filter>
<Filter Include="src\resources">
<UniqueIdentifier>{0340fbad-0c07-4923-afd2-183424c70967}</UniqueIdentifier>
</Filter>
+ <Filter Include="src\modules\_embed">
+ <UniqueIdentifier>{cb6d9d4e-046b-44c7-b00a-c316e87e035c}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\main.cpp">
@@ -155,24 +155,6 @@
<ClInclude Include="..\..\src\lua\common\constant.h">
<Filter>src\common</Filter>
</ClInclude>
- <ClInclude Include="..\..\src\lua\modules\embed\embed.h">
- <Filter>src\modules\embed</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\lua\modules\embed\graphics.lua.h">
- <Filter>src\modules\embed</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\lua\modules\embed\keyboard.lua.h">
- <Filter>src\modules\embed</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\lua\modules\embed\mouse.lua.h">
- <Filter>src\modules\embed</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\lua\modules\embed\net.lua.h">
- <Filter>src\modules\embed</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\lua\modules\embed\path.lua.h">
- <Filter>src\modules\embed</Filter>
- </ClInclude>
<ClInclude Include="..\..\src\lua\modules\net\Buffer.h">
<Filter>src\modules\net</Filter>
</ClInclude>
@@ -191,9 +173,6 @@
<ClInclude Include="..\..\src\lua\modules\jin.h">
<Filter>src\modules</Filter>
</ClInclude>
- <ClInclude Include="..\..\src\lua\modules\embed\boot.lua.h">
- <Filter>src\modules\embed</Filter>
- </ClInclude>
<ClInclude Include="..\..\src\luax.h">
<Filter>src</Filter>
</ClInclude>
@@ -203,6 +182,27 @@
<ClInclude Include="..\..\src\lua\modules\luax.h">
<Filter>src\modules</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\lua\modules\_embed\boot.lua.h">
+ <Filter>src\modules\_embed</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lua\modules\_embed\embed.h">
+ <Filter>src\modules\_embed</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lua\modules\_embed\graphics.lua.h">
+ <Filter>src\modules\_embed</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lua\modules\_embed\keyboard.lua.h">
+ <Filter>src\modules\_embed</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lua\modules\_embed\mouse.lua.h">
+ <Filter>src\modules\_embed</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lua\modules\_embed\net.lua.h">
+ <Filter>src\modules\_embed</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lua\modules\_embed\path.lua.h">
+ <Filter>src\modules\_embed</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="jin.rc">
generated by cgit v1.1-26-g67d0 at 2025-05-23 18:12:47 +0000