diff options
24 files changed, 371 insertions, 36 deletions
diff --git a/Bin/win64/LuaxTest.exe b/Bin/win64/LuaxTest.exe Binary files differindex 8aeac00..9a8058c 100644 --- a/Bin/win64/LuaxTest.exe +++ b/Bin/win64/LuaxTest.exe diff --git a/Build/Asura.Editor/Asura.Editor.vcxproj b/Build/Asura.Editor/Asura.Editor.vcxproj index be57c07..6779622 100644 --- a/Build/Asura.Editor/Asura.Editor.vcxproj +++ b/Build/Asura.Editor/Asura.Editor.vcxproj @@ -130,7 +130,7 @@ </ProjectReference> </ItemGroup> <ItemGroup> - <ClCompile Include="..\..\Source\Asura.Editor\Source\Editor.cpp" /> + <ClCompile Include="..\..\Source\Asura.Editor\source\editor.cpp" /> <ClCompile Include="..\..\Source\Asura.Editor\source\widgets\button.cpp" /> <ClCompile Include="..\..\Source\Asura.Editor\source\widgets\checkbox.cpp" /> <ClCompile Include="..\..\Source\Asura.Editor\source\widgets\hslider.cpp" /> diff --git a/Build/Asura.Editor/Asura.Editor.vcxproj.filters b/Build/Asura.Editor/Asura.Editor.vcxproj.filters index 393e51b..e171859 100644 --- a/Build/Asura.Editor/Asura.Editor.vcxproj.filters +++ b/Build/Asura.Editor/Asura.Editor.vcxproj.filters @@ -59,9 +59,6 @@ </ClInclude> </ItemGroup> <ItemGroup> - <ClCompile Include="..\..\Source\Asura.Editor\Source\Editor.cpp"> - <Filter>source</Filter> - </ClCompile> <ClCompile Include="..\..\Source\Asura.Editor\source\widgets\button.cpp"> <Filter>source\widgets</Filter> </ClCompile> @@ -89,5 +86,8 @@ <ClCompile Include="..\..\Source\Asura.Editor\source\widgets\vslider.cpp"> <Filter>source\widgets</Filter> </ClCompile> + <ClCompile Include="..\..\Source\Asura.Editor\source\editor.cpp"> + <Filter>source</Filter> + </ClCompile> </ItemGroup> </Project>
\ No newline at end of file diff --git a/Build/Asura.Engine/Asura.Engine.vcxproj b/Build/Asura.Engine/Asura.Engine.vcxproj index d238fdf..5185710 100644 --- a/Build/Asura.Engine/Asura.Engine.vcxproj +++ b/Build/Asura.Engine/Asura.Engine.vcxproj @@ -150,6 +150,7 @@ <ClInclude Include="..\..\Source\Asura.Engine\graphics\image_data.h" /> <ClInclude Include="..\..\Source\Asura.Engine\graphics\image_decoder.h" /> <ClInclude Include="..\..\Source\Asura.Engine\graphics\mesh2d.h" /> + <ClInclude Include="..\..\Source\Asura.Engine\graphics\mesh2d_data.h" /> <ClInclude Include="..\..\Source\Asura.Engine\graphics\pixel_format.h" /> <ClInclude Include="..\..\Source\Asura.Engine\graphics\png_decoder.h" /> <ClInclude Include="..\..\Source\Asura.Engine\graphics\quad.h" /> @@ -213,6 +214,7 @@ <ClCompile Include="..\..\Source\Asura.Engine\graphics\image.cpp" /> <ClCompile Include="..\..\Source\Asura.Engine\graphics\image_data.cpp" /> <ClCompile Include="..\..\Source\Asura.Engine\graphics\mesh2d.cpp" /> + <ClCompile Include="..\..\Source\Asura.Engine\graphics\mesh2d_data.cpp" /> <ClCompile Include="..\..\Source\Asura.Engine\graphics\png_decoder.cpp" /> <ClCompile Include="..\..\Source\Asura.Engine\graphics\quad.cpp" /> <ClCompile Include="..\..\Source\Asura.Engine\graphics\render_target.cpp" /> diff --git a/Build/Asura.Engine/Asura.Engine.vcxproj.filters b/Build/Asura.Engine/Asura.Engine.vcxproj.filters index 9aa09bc..1050926 100644 --- a/Build/Asura.Engine/Asura.Engine.vcxproj.filters +++ b/Build/Asura.Engine/Asura.Engine.vcxproj.filters @@ -196,6 +196,9 @@ <ClInclude Include="..\..\Source\Asura.Engine\scripting\portable.hpp"> <Filter>scripting</Filter> </ClInclude> + <ClInclude Include="..\..\Source\Asura.Engine\graphics\mesh2d_data.h"> + <Filter>graphics</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\Source\Asura.Engine\audio\sound.cpp"> @@ -335,6 +338,9 @@ <ClCompile Include="..\..\Source\Asura.Engine\scripting\portable.inl"> <Filter>scripting</Filter> </ClCompile> + <ClCompile Include="..\..\Source\Asura.Engine\graphics\mesh2d_data.cpp"> + <Filter>graphics</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <None Include="..\..\Source\Asura.Engine\input\cursor.defs"> diff --git a/Build/Asura.sln b/Build/Asura.sln index a02fd7d..582c299 100644 --- a/Build/Asura.sln +++ b/Build/Asura.sln @@ -63,6 +63,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LuaxTest", "Samples\LuaxTes EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AsuraTest", "Samples\AsuraTest\AsuraTest.vcxproj", "{D1039E03-DF4E-4CA2-8829-AE841B616E8E}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Box2dTest", "Samples\Box2dTest\Box2dTest.vcxproj", "{0D704DBD-CF24-4F28-8CD8-106DDE6DEB0D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ParticleEditor", "Samples\ParticleEditor\ParticleEditor.vcxproj", "{74FFC4E1-F8A5-4F6A-AACF-CF1B28F21CBC}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -295,6 +299,22 @@ Global {D1039E03-DF4E-4CA2-8829-AE841B616E8E}.Release|x64.Build.0 = Release|x64 {D1039E03-DF4E-4CA2-8829-AE841B616E8E}.Release|x86.ActiveCfg = Release|Win32 {D1039E03-DF4E-4CA2-8829-AE841B616E8E}.Release|x86.Build.0 = Release|Win32 + {0D704DBD-CF24-4F28-8CD8-106DDE6DEB0D}.Debug|x64.ActiveCfg = Debug|x64 + {0D704DBD-CF24-4F28-8CD8-106DDE6DEB0D}.Debug|x64.Build.0 = Debug|x64 + {0D704DBD-CF24-4F28-8CD8-106DDE6DEB0D}.Debug|x86.ActiveCfg = Debug|Win32 + {0D704DBD-CF24-4F28-8CD8-106DDE6DEB0D}.Debug|x86.Build.0 = Debug|Win32 + {0D704DBD-CF24-4F28-8CD8-106DDE6DEB0D}.Release|x64.ActiveCfg = Release|x64 + {0D704DBD-CF24-4F28-8CD8-106DDE6DEB0D}.Release|x64.Build.0 = Release|x64 + {0D704DBD-CF24-4F28-8CD8-106DDE6DEB0D}.Release|x86.ActiveCfg = Release|Win32 + {0D704DBD-CF24-4F28-8CD8-106DDE6DEB0D}.Release|x86.Build.0 = Release|Win32 + {74FFC4E1-F8A5-4F6A-AACF-CF1B28F21CBC}.Debug|x64.ActiveCfg = Debug|x64 + {74FFC4E1-F8A5-4F6A-AACF-CF1B28F21CBC}.Debug|x64.Build.0 = Debug|x64 + {74FFC4E1-F8A5-4F6A-AACF-CF1B28F21CBC}.Debug|x86.ActiveCfg = Debug|Win32 + {74FFC4E1-F8A5-4F6A-AACF-CF1B28F21CBC}.Debug|x86.Build.0 = Debug|Win32 + {74FFC4E1-F8A5-4F6A-AACF-CF1B28F21CBC}.Release|x64.ActiveCfg = Release|x64 + {74FFC4E1-F8A5-4F6A-AACF-CF1B28F21CBC}.Release|x64.Build.0 = Release|x64 + {74FFC4E1-F8A5-4F6A-AACF-CF1B28F21CBC}.Release|x86.ActiveCfg = Release|Win32 + {74FFC4E1-F8A5-4F6A-AACF-CF1B28F21CBC}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -320,6 +340,8 @@ Global {AEE37589-DE0D-4139-8BDB-8179FDEFB835} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} {87A4F855-66F2-4DBF-B86C-416E88DAC88A} = {E068D138-C824-4365-B5A3-27C65E8FD0B5} {D1039E03-DF4E-4CA2-8829-AE841B616E8E} = {E068D138-C824-4365-B5A3-27C65E8FD0B5} + {0D704DBD-CF24-4F28-8CD8-106DDE6DEB0D} = {E068D138-C824-4365-B5A3-27C65E8FD0B5} + {74FFC4E1-F8A5-4F6A-AACF-CF1B28F21CBC} = {E068D138-C824-4365-B5A3-27C65E8FD0B5} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {331032D8-F7CC-43E3-A03B-67108767F96B} diff --git a/Build/Samples/Box2dTest/Box2dTest.vcxproj b/Build/Samples/Box2dTest/Box2dTest.vcxproj new file mode 100644 index 0000000..96f90e6 --- /dev/null +++ b/Build/Samples/Box2dTest/Box2dTest.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>{0D704DBD-CF24-4F28-8CD8-106DDE6DEB0D}</ProjectGuid> + <RootNamespace>Box2dTest</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|x64'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <SDLCheck>true</SDLCheck> + <ConformanceMode>true</ConformanceMode> + </ClCompile> + </ItemDefinitionGroup> + <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)'=='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/Samples/Box2dTest/Box2dTest.vcxproj.filters b/Build/Samples/Box2dTest/Box2dTest.vcxproj.filters new file mode 100644 index 0000000..3c6f4fd --- /dev/null +++ b/Build/Samples/Box2dTest/Box2dTest.vcxproj.filters @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="源文件"> + <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> + <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> + </Filter> + <Filter Include="头文件"> + <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> + <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions> + </Filter> + <Filter Include="资源文件"> + <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> + <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> + </Filter> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/Build/Samples/Box2dTest/Box2dTest.vcxproj.user b/Build/Samples/Box2dTest/Box2dTest.vcxproj.user new file mode 100644 index 0000000..be25078 --- /dev/null +++ b/Build/Samples/Box2dTest/Box2dTest.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/Samples/ParticleEditor/ParticleEditor.vcxproj b/Build/Samples/ParticleEditor/ParticleEditor.vcxproj new file mode 100644 index 0000000..bbc1225 --- /dev/null +++ b/Build/Samples/ParticleEditor/ParticleEditor.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>{74FFC4E1-F8A5-4F6A-AACF-CF1B28F21CBC}</ProjectGuid> + <RootNamespace>ParticleEditor</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|x64'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <SDLCheck>true</SDLCheck> + <ConformanceMode>true</ConformanceMode> + </ClCompile> + </ItemDefinitionGroup> + <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)'=='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/Samples/ParticleEditor/ParticleEditor.vcxproj.filters b/Build/Samples/ParticleEditor/ParticleEditor.vcxproj.filters new file mode 100644 index 0000000..3c6f4fd --- /dev/null +++ b/Build/Samples/ParticleEditor/ParticleEditor.vcxproj.filters @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="源文件"> + <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> + <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> + </Filter> + <Filter Include="头文件"> + <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> + <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions> + </Filter> + <Filter Include="资源文件"> + <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> + <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> + </Filter> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/Build/Samples/ParticleEditor/ParticleEditor.vcxproj.user b/Build/Samples/ParticleEditor/ParticleEditor.vcxproj.user new file mode 100644 index 0000000..be25078 --- /dev/null +++ b/Build/Samples/ParticleEditor/ParticleEditor.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/Source/3rdParty/Luax/luax_memberref.h b/Source/3rdParty/Luax/luax_memberref.h index bb373ab..cda7946 100644 --- a/Source/3rdParty/Luax/luax_memberref.h +++ b/Source/3rdParty/Luax/luax_memberref.h @@ -8,6 +8,7 @@ namespace Luax /// /// ʵref tablemember refluax classĹʵref tableǿãmemberڡ + /// luanative֮ݹͨ /// class LuaxMemberRef { diff --git a/Source/Asura.Editor/Source/Widgets/Button.h b/Source/Asura.Editor/Source/Widgets/Button.h index b8c2f56..00f1c99 100644 --- a/Source/Asura.Editor/Source/Widgets/Button.h +++ b/Source/Asura.Editor/Source/Widgets/Button.h @@ -9,7 +9,9 @@ namespace AsuraEditor { - class Button : public Widget + class Button + : public Widget + , public AEScripting::Portable<Button> { public: diff --git a/Source/Asura.Editor/source/widgets/button.h b/Source/Asura.Editor/source/widgets/button.h index b8c2f56..00f1c99 100644 --- a/Source/Asura.Editor/source/widgets/button.h +++ b/Source/Asura.Editor/source/widgets/button.h @@ -9,7 +9,9 @@ namespace AsuraEditor { - class Button : public Widget + class Button + : public Widget + , public AEScripting::Portable<Button> { public: diff --git a/Source/Asura.Engine/Graphics/Shader.h b/Source/Asura.Engine/Graphics/Shader.h index 4976106..65f214e 100644 --- a/Source/Asura.Engine/Graphics/Shader.h +++ b/Source/Asura.Engine/Graphics/Shader.h @@ -11,7 +11,7 @@ #include "Math/Vector4.h" #include "Math/Matrix44.h" #include "StringMap.hpp" -#include "scripting/portable.h" +#include "scripting/portable.hpp" #include "Color.h" #include "Manager.hpp" #include "Texture.h" diff --git a/Source/Asura.Engine/graphics/binding/mesh2d_data.binding.cpp b/Source/Asura.Engine/graphics/binding/mesh2d_data.binding.cpp index e69de29..6e15052 100644 --- a/Source/Asura.Engine/graphics/binding/mesh2d_data.binding.cpp +++ b/Source/Asura.Engine/graphics/binding/mesh2d_data.binding.cpp @@ -0,0 +1,9 @@ +namespace AsuraEngine +{ + namespace Graphics + { + + + + } +}
\ No newline at end of file diff --git a/Source/Asura.Engine/graphics/binding/shader.binding.cpp b/Source/Asura.Engine/graphics/binding/shader.binding.cpp index 3f24bb7..1190997 100644 --- a/Source/Asura.Engine/graphics/binding/shader.binding.cpp +++ b/Source/Asura.Engine/graphics/binding/shader.binding.cpp @@ -1,4 +1,4 @@ -#include "../Shader.h" +#include "../shader.h" using namespace Luax; @@ -7,6 +7,27 @@ namespace AsuraEngine namespace Graphics { + void Shader::RegisterLuaxInterface(LuaxState& state) + { + + } + + void Shader::RegisterLuaxClass(LuaxState& state) + { + + LuaxEnum EBuiltIn[] = { + {0, 0} + }; + + state.RegisterEnum("EBuiltIn", EBuiltIn); + + } + + void Shader::RegisterLuaxPostprocess(LuaxState& state) + { + + } + /// /// shaderΪ /// @@ -94,26 +115,5 @@ namespace AsuraEngine } - void Shader::RegisterLuaxInterface(LuaxState& state) - { - - } - - void Shader::RegisterLuaxClass(LuaxState& state) - { - - LuaxEnum EBuiltIn[] = { - {0, 0} - }; - - state.RegisterEnum("EBuiltIn", EBuiltIn); - - } - - void Shader::RegisterLuaxPostprocess(LuaxState& state) - { - - } - } }
\ No newline at end of file diff --git a/Source/Asura.Engine/graphics/mesh2d_data.cpp b/Source/Asura.Engine/graphics/mesh2d_data.cpp new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Source/Asura.Engine/graphics/mesh2d_data.cpp diff --git a/Source/Asura.Engine/graphics/mesh2d_data.h b/Source/Asura.Engine/graphics/mesh2d_data.h new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Source/Asura.Engine/graphics/mesh2d_data.h diff --git a/Source/Asura.Engine/graphics/shader.h b/Source/Asura.Engine/graphics/shader.h index 4976106..65f214e 100644 --- a/Source/Asura.Engine/graphics/shader.h +++ b/Source/Asura.Engine/graphics/shader.h @@ -11,7 +11,7 @@ #include "Math/Vector4.h" #include "Math/Matrix44.h" #include "StringMap.hpp" -#include "scripting/portable.h" +#include "scripting/portable.hpp" #include "Color.h" #include "Manager.hpp" #include "Texture.h" diff --git a/Source/Asura.Engine/graphics/stb_decoder.h b/Source/Asura.Engine/graphics/stb_decoder.h index b8fb83c..57b247c 100644 --- a/Source/Asura.Engine/graphics/stb_decoder.h +++ b/Source/Asura.Engine/graphics/stb_decoder.h @@ -11,7 +11,8 @@ namespace AsuraEngine /// /// ʹstb_imageѹJPEGTGABMPļ /// - class STBDecoder ASURA_FINAL: public ImageDecoder + class STBDecoder ASURA_FINAL + : public ImageDecoder { public: diff --git a/Source/Asura.Engine/scripting/portable.hpp b/Source/Asura.Engine/scripting/portable.hpp index 773e7ad..450f4bb 100644 --- a/Source/Asura.Engine/scripting/portable.hpp +++ b/Source/Asura.Engine/scripting/portable.hpp @@ -17,12 +17,15 @@ namespace AsuraEngine Portable(); virtual ~Portable(); - +/* + /// + /// ڶ̼߳ + /// void Retain(); void Release(); - +*/ private: - +/* /// /// ̱߳luagc߳˴native objectdelete /// @@ -32,7 +35,7 @@ namespace AsuraEngine /// deleteգ̳portable࣬ʹdeleteֻʹRelease /// bool mSafer; - +*/ }; #include "portable.inl" diff --git a/Source/Asura.Engine/scripting/portable.inl b/Source/Asura.Engine/scripting/portable.inl index a27b2e8..f73046a 100644 --- a/Source/Asura.Engine/scripting/portable.inl +++ b/Source/Asura.Engine/scripting/portable.inl @@ -1,4 +1,4 @@ - +/* template<typename T> Portable<T>::Portable() : mRefCount(1) @@ -28,3 +28,4 @@ void Portable<T>::Release() } } +*/
\ No newline at end of file |