aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2018-12-07 08:46:17 +0800
committerchai <chaifix@163.com>2018-12-07 08:46:17 +0800
commitb4bd76b8b02996767798b76cc65dee9ea27f1167 (patch)
treed20e1b31032b4908b95b2e0d0612ae1ad18d19ee
parentafc5ebdeece428d4ef72f4f1f4b178a92d1b9cba (diff)
*misc
Diffstat
-rw-r--r--bin/ParticleSystem.exebin1053696 -> 0 bytes
-rw-r--r--bin/SDL2.dllbin1279488 -> 1279488 bytes
-rw-r--r--bin/game/config.lua2
-rw-r--r--bin/game/main.lua10
-rw-r--r--bin/jin.exebin1597440 -> 2056704 bytes
-rw-r--r--bin/lua51.dllbin364544 -> 364544 bytes
-rw-r--r--build/vc++/3rdparty/Lua51/Lua51.vcxproj185
-rw-r--r--build/vc++/3rdparty/Lua51/Lua51.vcxproj.filters64
-rw-r--r--build/vc++/3rdparty/Lua51/Lua51.vcxproj.user4
-rw-r--r--build/vc++/3rdparty/LuaJIT-2.0.5/LuaJIT-2.0.5.vcxproj2
-rw-r--r--build/vc++/jin.sln11
-rw-r--r--src/jin/main.cpp2
-rw-r--r--src/libjin/graphics/je_window.cpp5
-rw-r--r--src/lua/embed/embed.h26
-rw-r--r--src/lua/jin.cpp3
-rw-r--r--src/lua/modules/graphics/je_lua_graphics.cpp2
16 files changed, 293 insertions, 23 deletions
diff --git a/bin/ParticleSystem.exe b/bin/ParticleSystem.exe
deleted file mode 100644
index b3ffd73..0000000
--- a/bin/ParticleSystem.exe
+++ /dev/null
Binary files differ
diff --git a/bin/SDL2.dll b/bin/SDL2.dll
index 65f23c8..0b08ce2 100644
--- a/bin/SDL2.dll
+++ b/bin/SDL2.dll
Binary files differ
diff --git a/bin/game/config.lua b/bin/game/config.lua
index 095ee28..ba2e9df 100644
--- a/bin/game/config.lua
+++ b/bin/game/config.lua
@@ -1,6 +1,6 @@
return
{
title = "window form",
- icon = "splash.png",
+ --icon = "splash.png",
vsync = true
} \ No newline at end of file
diff --git a/bin/game/main.lua b/bin/game/main.lua
index 9070d2c..8ff5e68 100644
--- a/bin/game/main.lua
+++ b/bin/game/main.lua
@@ -61,9 +61,9 @@ local function createAnimation(path, count, r, c, w, h, loop, speed)
end
function jin.core.onLoad()
- bitmap = jin.graphics.newBitmap(200, 200, function(w, h, x, y)
- return {255*math.sin(x/w),255 - 255,255*math.cos(y/w),255}
- end)
+ -- bitmap = jin.graphics.newBitmap(200, 200, function(w, h, x, y)
+ -- return {255*math.sin(x/w),255 - 255,255*math.cos(y/w),255}
+ -- end)
shader_program = jin.graphics.newShader(shader)
shader_program2 = jin.graphics.newShader(shader2)
local animation = createAnimation("anim2.png", 27, 3, 10, 200, 200, true, 50)
@@ -113,12 +113,12 @@ function jin.core.onDraw()
--jin.graphics.draw(sprs[2], 150, 150, 1, 1, 0)
local x, y = jin.mouse.getPosition()
animator:render(x, y, 1, 1, 0)
- jin.graphics.print(#sprs, 10, 10)
+ --jin.graphics.print(#sprs, 10, 10)
jin.graphics.draw(spr, 100, 200, 1, 1, 0)
--jin.graphics.useShader(shader_program2)
--jin.graphics.draw(tex, 0, 0,0.2, 0.2)
--jin.graphics.unuseShader()
if stop then
- jin.graphics.print("Quit", 100, 300)
+ --jin.graphics.print("Quit", 100, 300)
end
end \ No newline at end of file
diff --git a/bin/jin.exe b/bin/jin.exe
index 92d3665..b2288e4 100644
--- a/bin/jin.exe
+++ b/bin/jin.exe
Binary files differ
diff --git a/bin/lua51.dll b/bin/lua51.dll
index a47ab15..5f7d120 100644
--- a/bin/lua51.dll
+++ b/bin/lua51.dll
Binary files differ
diff --git a/build/vc++/3rdparty/Lua51/Lua51.vcxproj b/build/vc++/3rdparty/Lua51/Lua51.vcxproj
new file mode 100644
index 0000000..64eef69
--- /dev/null
+++ b/build/vc++/3rdparty/Lua51/Lua51.vcxproj
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <VCProjectVersion>15.0</VCProjectVersion>
+ <ProjectGuid>{4156CD69-6FC4-4B32-B008-BB94C8AE17F5}</ProjectGuid>
+ <RootNamespace>Lua51</RootNamespace>
+ <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v141</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v141</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v141</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v141</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="Shared">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <OutDir>$(SolutionDir)..\..\bin</OutDir>
+ <TargetName>lua51</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ </ClCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ </ClCompile>
+ <Link>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ </ClCompile>
+ <Link>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lapi.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lauxlib.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lbaselib.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lcode.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\ldblib.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\ldebug.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\ldo.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\ldump.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lfunc.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lgc.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\linit.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\liolib.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\llex.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lmathlib.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lmem.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\loadlib.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lobject.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lopcodes.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\loslib.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lparser.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lstate.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lstring.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lstrlib.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\ltable.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\ltablib.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\ltm.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\luac.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lundump.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lvm.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lzio.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\print.c" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lapi.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lauxlib.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lcode.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\ldebug.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\ldo.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lfunc.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lgc.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\llex.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\llimits.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lmem.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lobject.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lopcodes.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lparser.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lstate.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lstring.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\ltable.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\ltm.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lua.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\luaconf.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lualib.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lundump.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lvm.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lzio.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\Makefile" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project> \ No newline at end of file
diff --git a/build/vc++/3rdparty/Lua51/Lua51.vcxproj.filters b/build/vc++/3rdparty/Lua51/Lua51.vcxproj.filters
new file mode 100644
index 0000000..caba523
--- /dev/null
+++ b/build/vc++/3rdparty/Lua51/Lua51.vcxproj.filters
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lapi.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lauxlib.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lbaselib.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lcode.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\ldblib.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\ldebug.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\ldo.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\ldump.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lfunc.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lgc.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\linit.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\liolib.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\llex.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lmathlib.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lmem.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\loadlib.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lobject.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lopcodes.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\loslib.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lparser.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lstate.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lstring.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lstrlib.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\ltable.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\ltablib.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\ltm.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\luac.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lundump.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lvm.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lzio.c" />
+ <ClCompile Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\print.c" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lapi.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lauxlib.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lcode.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\ldebug.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\ldo.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lfunc.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lgc.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\llex.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\llimits.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lmem.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lobject.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lopcodes.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lparser.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lstate.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lstring.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\ltable.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\ltm.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lua.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\luaconf.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lualib.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lundump.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lvm.h" />
+ <ClInclude Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\lzio.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="..\..\..\..\src\3rdparty\lua-5.1.5\src\Makefile" />
+ </ItemGroup>
+</Project> \ No newline at end of file
diff --git a/build/vc++/3rdparty/Lua51/Lua51.vcxproj.user b/build/vc++/3rdparty/Lua51/Lua51.vcxproj.user
new file mode 100644
index 0000000..be25078
--- /dev/null
+++ b/build/vc++/3rdparty/Lua51/Lua51.vcxproj.user
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup />
+</Project> \ No newline at end of file
diff --git a/build/vc++/3rdparty/LuaJIT-2.0.5/LuaJIT-2.0.5.vcxproj b/build/vc++/3rdparty/LuaJIT-2.0.5/LuaJIT-2.0.5.vcxproj
index 30333ce..59e6f10 100644
--- a/build/vc++/3rdparty/LuaJIT-2.0.5/LuaJIT-2.0.5.vcxproj
+++ b/build/vc++/3rdparty/LuaJIT-2.0.5/LuaJIT-2.0.5.vcxproj
@@ -22,7 +22,7 @@
<VCProjectVersion>15.0</VCProjectVersion>
<ProjectGuid>{45AC0438-98A8-4369-A21D-BBCBE7995B34}</ProjectGuid>
<RootNamespace>LuaJIT205</RootNamespace>
- <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
diff --git a/build/vc++/jin.sln b/build/vc++/jin.sln
index ed41fc7..2fa044e 100644
--- a/build/vc++/jin.sln
+++ b/build/vc++/jin.sln
@@ -47,6 +47,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinyxml2", "3rdparty\tinyxm
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "luax", "3rdparty\luax\luax.vcxproj", "{C6B16179-5640-4D41-8756-0525D25EB569}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Lua51", "3rdparty\Lua51\Lua51.vcxproj", "{4156CD69-6FC4-4B32-B008-BB94C8AE17F5}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
@@ -183,6 +185,14 @@ Global
{C6B16179-5640-4D41-8756-0525D25EB569}.Release|x64.Build.0 = Release|x64
{C6B16179-5640-4D41-8756-0525D25EB569}.Release|x86.ActiveCfg = Release|Win32
{C6B16179-5640-4D41-8756-0525D25EB569}.Release|x86.Build.0 = Release|Win32
+ {4156CD69-6FC4-4B32-B008-BB94C8AE17F5}.Debug|x64.ActiveCfg = Debug|x64
+ {4156CD69-6FC4-4B32-B008-BB94C8AE17F5}.Debug|x64.Build.0 = Debug|x64
+ {4156CD69-6FC4-4B32-B008-BB94C8AE17F5}.Debug|x86.ActiveCfg = Debug|Win32
+ {4156CD69-6FC4-4B32-B008-BB94C8AE17F5}.Debug|x86.Build.0 = Debug|Win32
+ {4156CD69-6FC4-4B32-B008-BB94C8AE17F5}.Release|x64.ActiveCfg = Release|x64
+ {4156CD69-6FC4-4B32-B008-BB94C8AE17F5}.Release|x64.Build.0 = Release|x64
+ {4156CD69-6FC4-4B32-B008-BB94C8AE17F5}.Release|x86.ActiveCfg = Release|Win32
+ {4156CD69-6FC4-4B32-B008-BB94C8AE17F5}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -206,6 +216,7 @@ Global
{45AC0438-98A8-4369-A21D-BBCBE7995B34} = {2A2F610D-E42B-426F-8DC8-79E0C6FCCDD2}
{A5B92785-7D5A-4910-AA54-C0872F3C605D} = {65DFFFA6-F434-47FB-9DB2-DCF019060B92}
{C6B16179-5640-4D41-8756-0525D25EB569} = {65DFFFA6-F434-47FB-9DB2-DCF019060B92}
+ {4156CD69-6FC4-4B32-B008-BB94C8AE17F5} = {2A2F610D-E42B-426F-8DC8-79E0C6FCCDD2}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {633D8D43-3349-43F7-8835-7D7F58BAD2A8}
diff --git a/src/jin/main.cpp b/src/jin/main.cpp
index f76bda7..e2f5763 100644
--- a/src/jin/main.cpp
+++ b/src/jin/main.cpp
@@ -17,7 +17,7 @@ using namespace JinEngine::Filesystem;
// Load game under cwd.
static void load(const char* cwd)
{
- // Global lua runtime.
+ // Main thread lua runtime.
lua_State* L = luax_newstate();
// Open lua standard module.
diff --git a/src/libjin/graphics/je_window.cpp b/src/libjin/graphics/je_window.cpp
index 148f1b9..e7cdf06 100644
--- a/src/libjin/graphics/je_window.cpp
+++ b/src/libjin/graphics/je_window.cpp
@@ -68,7 +68,7 @@ namespace JinEngine
if (mWnd == NULL)
return false;
- // Set window icon
+ // Set window icon.
try
{
Bitmap* bitmap = new Bitmap(icon);
@@ -97,9 +97,6 @@ namespace JinEngine
// Bind to default canvas.
gl.unbindCanvas();
gl.unuseShader();
- //Shader::unuse();
- // Avoid white blinnk.
- swapBuffers();
return true;
}
diff --git a/src/lua/embed/embed.h b/src/lua/embed/embed.h
index a063e65..4b1c6d9 100644
--- a/src/lua/embed/embed.h
+++ b/src/lua/embed/embed.h
@@ -14,30 +14,38 @@ namespace JinEngine
};
// Embed scripts.
-#include "scripts/graphics.lua.h"
-#include "scripts/keyboard.lua.h"
-#include "scripts/mouse.lua.h"
-#include "scripts/boot.lua.h"
+ #include "scripts/graphics.lua.h"
+ #include "scripts/keyboard.lua.h"
+ #include "scripts/mouse.lua.h"
+ #include "scripts/boot.lua.h"
// In order.
- static const jin_Embed scripts[] = {
+ static const jin_Embed modules[] = {
{ "graphics.lua", graphics_lua },
{ "keyboard.lua", keyboard_lua },
{ "mouse.lua", mouse_lua },
- { "boot.lua", boot_lua },
{ 0, 0 }
};
- static void boot(lua_State* L)
+ static const jin_Embed boot_script = { "boot", boot_lua };
+
+ static void load(lua_State* L)
{
- for (int i = 0; scripts[i].file; ++i)
+ for (int i = 0; modules[i].file; ++i)
{
- const char* file = scripts[i].file, *source = scripts[i].source;
+ const char* file = modules[i].file, *source = modules[i].source;
if (luax_loadbuffer(L, source, strlen(source), file) == 0)
lua_call(L, 0, 0);
}
}
+ static void run(lua_State* L)
+ {
+ const char* file = boot_script.file, *source = boot_script.source;
+ if (luax_loadbuffer(L, source, strlen(source), file) == 0)
+ lua_call(L, 0, 0);
+ }
+
} // namespace Embed
} // namespace JinEngine
diff --git a/src/lua/jin.cpp b/src/lua/jin.cpp
index b11488b..79a7bf8 100644
--- a/src/lua/jin.cpp
+++ b/src/lua/jin.cpp
@@ -95,8 +95,9 @@ namespace JinEngine
luax_newtable(L);
luax_setfieldstring(L, "cwd", cwd);
luax_setfield(L, -2, "args");
+ Embed::load(L);
luax_clearstack(L);
- JinEngine::Embed::boot(L);
+ Embed::run(L);
}
} // namespace Lua
diff --git a/src/lua/modules/graphics/je_lua_graphics.cpp b/src/lua/modules/graphics/je_lua_graphics.cpp
index 8ace62c..981e30f 100644
--- a/src/lua/modules/graphics/je_lua_graphics.cpp
+++ b/src/lua/modules/graphics/je_lua_graphics.cpp
@@ -34,7 +34,7 @@ namespace JinEngine
namespace Lua
{
-#include "../../resources/font.ttf.h"
+ #include "../../resources/font.ttf.h"
static struct
{
generated by cgit v1.1-26-g67d0 at 2025-05-21 13:47:37 +0000