diff options
| -rw-r--r-- | Build/3rdParty/glad/glad.vcxproj | 122 | ||||
| -rw-r--r-- | Build/3rdParty/glad/glad.vcxproj.filters | 2 | ||||
| -rw-r--r-- | Build/3rdParty/glad/glad.vcxproj.user (renamed from Build/Lua51/Lua51.vcxproj.user) | 0 | ||||
| -rw-r--r-- | Build/3rdParty/lua51/lua51.vcxproj (renamed from Build/Lua51/Lua51.vcxproj) | 116 | ||||
| -rw-r--r-- | Build/3rdParty/lua51/lua51.vcxproj.filters | 65 | ||||
| -rw-r--r-- | Build/3rdParty/lua51/lua51.vcxproj.user | 4 | ||||
| -rw-r--r-- | Build/Asura.sln | 31 | ||||
| -rw-r--r-- | Build/Lua51/Lua51.vcxproj.filters | 65 | ||||
| -rw-r--r-- | Source/Asura/Graphics/Material.cpp | 18 | ||||
| -rw-r--r-- | Source/Asura/Graphics/Material.h | 29 | ||||
| -rw-r--r-- | Source/Asura/Graphics/Renderer.cpp | 0 | ||||
| -rw-r--r-- | Source/Asura/Graphics/Renderer.h | 27 |
12 files changed, 337 insertions, 142 deletions
diff --git a/Build/3rdParty/glad/glad.vcxproj b/Build/3rdParty/glad/glad.vcxproj new file mode 100644 index 0000000..70e2869 --- /dev/null +++ b/Build/3rdParty/glad/glad.vcxproj @@ -0,0 +1,122 @@ +<?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>{C0ED7D78-570B-454A-B3B6-576FDCB43D69}</ProjectGuid> + <RootNamespace>glad</RootNamespace> + <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</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 /> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <SDLCheck>true</SDLCheck> + <ConformanceMode>true</ConformanceMode> + </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> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project>
\ No newline at end of file diff --git a/Build/3rdParty/glad/glad.vcxproj.filters b/Build/3rdParty/glad/glad.vcxproj.filters new file mode 100644 index 0000000..9cd8510 --- /dev/null +++ b/Build/3rdParty/glad/glad.vcxproj.filters @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />
\ No newline at end of file diff --git a/Build/Lua51/Lua51.vcxproj.user b/Build/3rdParty/glad/glad.vcxproj.user index be25078..be25078 100644 --- a/Build/Lua51/Lua51.vcxproj.user +++ b/Build/3rdParty/glad/glad.vcxproj.user diff --git a/Build/Lua51/Lua51.vcxproj b/Build/3rdParty/lua51/lua51.vcxproj index 28d30f3..0b1df9c 100644 --- a/Build/Lua51/Lua51.vcxproj +++ b/Build/3rdParty/lua51/lua51.vcxproj @@ -20,8 +20,8 @@ </ItemGroup> <PropertyGroup Label="Globals"> <VCProjectVersion>15.0</VCProjectVersion> - <ProjectGuid>{DFE6C528-0F03-4512-85D3-B4A632518F12}</ProjectGuid> - <RootNamespace>Lua51</RootNamespace> + <ProjectGuid>{8B8FCA14-FC8A-45B4-BF3C-9340CB586076}</ProjectGuid> + <RootNamespace>lua51</RootNamespace> <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> @@ -115,66 +115,66 @@ </Link> </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\lapi.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\lauxlib.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\lbaselib.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\lcode.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\ldblib.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\ldebug.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\ldo.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\ldump.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\lfunc.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\lgc.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\linit.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\liolib.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\llex.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\lmathlib.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\lmem.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\loadlib.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\lobject.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\lopcodes.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\loslib.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\lparser.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\lstate.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\lstring.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\lstrlib.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\ltable.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\ltablib.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\ltm.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\lua.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\luac.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\lundump.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\lvm.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\lzio.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\print.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\lapi.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\lauxlib.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\lbaselib.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\lcode.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\ldblib.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\ldebug.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\ldo.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\ldump.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\lfunc.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\lgc.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\linit.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\liolib.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\llex.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\lmathlib.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\lmem.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\loadlib.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\lobject.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\lopcodes.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\loslib.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\lparser.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\lstate.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\lstring.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\lstrlib.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\ltable.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\ltablib.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\ltm.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\lua.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\luac.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\lundump.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\lvm.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\lzio.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\print.c" /> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\lapi.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\lauxlib.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\lcode.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\ldebug.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\ldo.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\lfunc.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\lgc.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\llex.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\llimits.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\lmem.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\lobject.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\lopcodes.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\lparser.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\lstate.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\lstring.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\ltable.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\ltm.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\lua.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\luaconf.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\lualib.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\lundump.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\lvm.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\lzio.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\lapi.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\lauxlib.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\lcode.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\ldebug.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\ldo.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\lfunc.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\lgc.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\llex.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\llimits.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\lmem.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\lobject.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\lopcodes.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\lparser.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\lstate.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\lstring.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\ltable.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\ltm.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\lua.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\luaconf.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\lualib.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\lundump.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\lvm.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\lzio.h" /> </ItemGroup> <ItemGroup> - <None Include="..\..\Source\3rdParty\Lua5.1\Makefile" /> + <None Include="..\..\..\Source\3rdParty\Lua51\Makefile" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> diff --git a/Build/3rdParty/lua51/lua51.vcxproj.filters b/Build/3rdParty/lua51/lua51.vcxproj.filters new file mode 100644 index 0000000..416c92e --- /dev/null +++ b/Build/3rdParty/lua51/lua51.vcxproj.filters @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\lapi.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\lauxlib.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\lbaselib.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\lcode.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\ldblib.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\ldebug.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\ldo.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\ldump.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\lfunc.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\lgc.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\linit.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\liolib.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\llex.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\lmathlib.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\lmem.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\loadlib.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\lobject.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\lopcodes.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\loslib.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\lparser.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\lstate.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\lstring.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\lstrlib.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\ltable.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\ltablib.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\ltm.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\lua.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\luac.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\lundump.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\lvm.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\lzio.c" /> + <ClCompile Include="..\..\..\Source\3rdParty\Lua51\print.c" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\lapi.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\lauxlib.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\lcode.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\ldebug.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\ldo.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\lfunc.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\lgc.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\llex.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\llimits.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\lmem.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\lobject.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\lopcodes.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\lparser.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\lstate.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\lstring.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\ltable.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\ltm.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\lua.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\luaconf.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\lualib.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\lundump.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\lvm.h" /> + <ClInclude Include="..\..\..\Source\3rdParty\Lua51\lzio.h" /> + </ItemGroup> + <ItemGroup> + <None Include="..\..\..\Source\3rdParty\Lua51\Makefile" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/Build/3rdParty/lua51/lua51.vcxproj.user b/Build/3rdParty/lua51/lua51.vcxproj.user new file mode 100644 index 0000000..be25078 --- /dev/null +++ b/Build/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/Asura.sln b/Build/Asura.sln index 0731185..b1cff60 100644 --- a/Build/Asura.sln +++ b/Build/Asura.sln @@ -13,7 +13,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Editor", "Editor\Editor.vcx EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Luax", "3rdParty\Luax\Luax.vcxproj", "{1350CEE9-B2C2-426A-AF4E-F651D51DD592}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Lua51", "Lua51\Lua51.vcxproj", "{DFE6C528-0F03-4512-85D3-B4A632518F12}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glad", "3rdParty\glad\glad.vcxproj", "{C0ED7D78-570B-454A-B3B6-576FDCB43D69}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua51", "3rdParty\lua51\lua51.vcxproj", "{8B8FCA14-FC8A-45B4-BF3C-9340CB586076}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -55,21 +57,30 @@ Global {1350CEE9-B2C2-426A-AF4E-F651D51DD592}.Release|x64.Build.0 = Release|x64 {1350CEE9-B2C2-426A-AF4E-F651D51DD592}.Release|x86.ActiveCfg = Release|Win32 {1350CEE9-B2C2-426A-AF4E-F651D51DD592}.Release|x86.Build.0 = Release|Win32 - {DFE6C528-0F03-4512-85D3-B4A632518F12}.Debug|x64.ActiveCfg = Debug|x64 - {DFE6C528-0F03-4512-85D3-B4A632518F12}.Debug|x64.Build.0 = Debug|x64 - {DFE6C528-0F03-4512-85D3-B4A632518F12}.Debug|x86.ActiveCfg = Debug|Win32 - {DFE6C528-0F03-4512-85D3-B4A632518F12}.Debug|x86.Build.0 = Debug|Win32 - {DFE6C528-0F03-4512-85D3-B4A632518F12}.Release|x64.ActiveCfg = Release|x64 - {DFE6C528-0F03-4512-85D3-B4A632518F12}.Release|x64.Build.0 = Release|x64 - {DFE6C528-0F03-4512-85D3-B4A632518F12}.Release|x86.ActiveCfg = Release|Win32 - {DFE6C528-0F03-4512-85D3-B4A632518F12}.Release|x86.Build.0 = Release|Win32 + {C0ED7D78-570B-454A-B3B6-576FDCB43D69}.Debug|x64.ActiveCfg = Debug|x64 + {C0ED7D78-570B-454A-B3B6-576FDCB43D69}.Debug|x64.Build.0 = Debug|x64 + {C0ED7D78-570B-454A-B3B6-576FDCB43D69}.Debug|x86.ActiveCfg = Debug|Win32 + {C0ED7D78-570B-454A-B3B6-576FDCB43D69}.Debug|x86.Build.0 = Debug|Win32 + {C0ED7D78-570B-454A-B3B6-576FDCB43D69}.Release|x64.ActiveCfg = Release|x64 + {C0ED7D78-570B-454A-B3B6-576FDCB43D69}.Release|x64.Build.0 = Release|x64 + {C0ED7D78-570B-454A-B3B6-576FDCB43D69}.Release|x86.ActiveCfg = Release|Win32 + {C0ED7D78-570B-454A-B3B6-576FDCB43D69}.Release|x86.Build.0 = Release|Win32 + {8B8FCA14-FC8A-45B4-BF3C-9340CB586076}.Debug|x64.ActiveCfg = Debug|x64 + {8B8FCA14-FC8A-45B4-BF3C-9340CB586076}.Debug|x64.Build.0 = Debug|x64 + {8B8FCA14-FC8A-45B4-BF3C-9340CB586076}.Debug|x86.ActiveCfg = Debug|Win32 + {8B8FCA14-FC8A-45B4-BF3C-9340CB586076}.Debug|x86.Build.0 = Debug|Win32 + {8B8FCA14-FC8A-45B4-BF3C-9340CB586076}.Release|x64.ActiveCfg = Release|x64 + {8B8FCA14-FC8A-45B4-BF3C-9340CB586076}.Release|x64.Build.0 = Release|x64 + {8B8FCA14-FC8A-45B4-BF3C-9340CB586076}.Release|x86.ActiveCfg = Release|Win32 + {8B8FCA14-FC8A-45B4-BF3C-9340CB586076}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {1350CEE9-B2C2-426A-AF4E-F651D51DD592} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} - {DFE6C528-0F03-4512-85D3-B4A632518F12} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} + {C0ED7D78-570B-454A-B3B6-576FDCB43D69} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} + {8B8FCA14-FC8A-45B4-BF3C-9340CB586076} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {331032D8-F7CC-43E3-A03B-67108767F96B} diff --git a/Build/Lua51/Lua51.vcxproj.filters b/Build/Lua51/Lua51.vcxproj.filters deleted file mode 100644 index f8d1d7b..0000000 --- a/Build/Lua51/Lua51.vcxproj.filters +++ /dev/null @@ -1,65 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\lapi.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\lauxlib.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\lbaselib.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\lcode.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\ldblib.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\ldebug.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\ldo.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\ldump.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\lfunc.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\lgc.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\linit.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\liolib.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\llex.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\lmathlib.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\lmem.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\loadlib.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\lobject.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\lopcodes.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\loslib.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\lparser.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\lstate.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\lstring.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\lstrlib.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\ltable.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\ltablib.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\ltm.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\lua.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\luac.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\lundump.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\lvm.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\lzio.c" /> - <ClCompile Include="..\..\Source\3rdParty\Lua5.1\print.c" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\lapi.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\lauxlib.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\lcode.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\ldebug.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\ldo.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\lfunc.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\lgc.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\llex.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\llimits.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\lmem.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\lobject.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\lopcodes.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\lparser.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\lstate.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\lstring.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\ltable.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\ltm.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\lua.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\luaconf.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\lualib.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\lundump.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\lvm.h" /> - <ClInclude Include="..\..\Source\3rdParty\Lua5.1\lzio.h" /> - </ItemGroup> - <ItemGroup> - <None Include="..\..\Source\3rdParty\Lua5.1\Makefile" /> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/Source/Asura/Graphics/Material.cpp b/Source/Asura/Graphics/Material.cpp index e69de29..eaf9742 100644 --- a/Source/Asura/Graphics/Material.cpp +++ b/Source/Asura/Graphics/Material.cpp @@ -0,0 +1,18 @@ +#include "Material.h" + +namespace AsuraEngine +{ + namespace Graphics + { + + + + //-------------------------------------------------------------------------------------------------------- + + int Material::l_SetColor(lua_State* L) + { + + } + + } +} diff --git a/Source/Asura/Graphics/Material.h b/Source/Asura/Graphics/Material.h index 538e651..6093d18 100644 --- a/Source/Asura/Graphics/Material.h +++ b/Source/Asura/Graphics/Material.h @@ -2,6 +2,7 @@ #define __AE_MATERIAL_H__ #include "Containers/Vector.hpp" +#include "Containers/String.h" #include "Math/Vector2.h" #include "Math/Vector3.h" #include "Math/Vector4.h" @@ -24,8 +25,16 @@ namespace AsuraEngine class Material : public Object { public: + Material(); + Material(const Material& srcMat); + ~Material(); + + Material* Clone(); + // Uniform + static int GetUniformID(const Containers::String& name); + void SetTexture(int ID, Texture* texture); void SetVector2(int ID, Math::Vector2* vector2); void SetVector3(int ID, Math::Vector3* vector3); @@ -41,15 +50,17 @@ namespace AsuraEngine //---------------------------------------------------------------------------------------------------- - LUAX_DECL_METHOD( _SetTexture ); - LUAX_DECL_METHOD( _SetVector2 ); - LUAX_DECL_METHOD( _SetVector3 ); - LUAX_DECL_METHOD( _SetVector4 ); - LUAX_DECL_METHOD( _SetMatrix44 ); - LUAX_DECL_METHOD( _SetFloat ); - LUAX_DECL_METHOD( _SetInteger ); - LUAX_DECL_METHOD( _SetColor ); - LUAX_DECL_METHOD( _SetVertexAttributes ); + LUAX_DECL_FACTORY( Material ); + + LUAX_DECL_METHOD( l_SetTexture ); + LUAX_DECL_METHOD( l_SetVector2 ); + LUAX_DECL_METHOD( l_SetVector3 ); + LUAX_DECL_METHOD( l_SetVector4 ); + LUAX_DECL_METHOD( l_SetMatrix44 ); + LUAX_DECL_METHOD( l_SetFloat ); + LUAX_DECL_METHOD( l_SetInteger ); + LUAX_DECL_METHOD( l_SetColor ); + LUAX_DECL_METHOD( l_SetVertexAttributes ); private: //Color mColor; diff --git a/Source/Asura/Graphics/Renderer.cpp b/Source/Asura/Graphics/Renderer.cpp new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Source/Asura/Graphics/Renderer.cpp diff --git a/Source/Asura/Graphics/Renderer.h b/Source/Asura/Graphics/Renderer.h new file mode 100644 index 0000000..004bbe4 --- /dev/null +++ b/Source/Asura/Graphics/Renderer.h @@ -0,0 +1,27 @@ +#ifndef __AE_RENDERER_H__ +#define __AE_RENDERER_H__ + +#include "Material.h" + +namespace AsuraEngine +{ + namespace Graphics + { + + class Renderer + { + public: + /// + /// + /// + Material* GetMaterial(); + + private: + Material* mMaterial; + + }; + + } +} + +#endif
\ No newline at end of file |