From fb830270c5269a22819a0c0f1ee280f9aa3f1b39 Mon Sep 17 00:00:00 2001 From: chai Date: Sun, 17 Mar 2019 09:12:29 +0800 Subject: *luax --- Bin/win64/LuaxTest.exe | Bin 549376 -> 549376 bytes Build/Asura.Editor/Asura.Editor.vcxproj | 2 +- Build/Asura.Editor/Asura.Editor.vcxproj.filters | 6 +- Build/Asura.Engine/Asura.Engine.vcxproj | 2 + Build/Asura.Engine/Asura.Engine.vcxproj.filters | 6 + Build/Asura.sln | 22 ++++ Build/Samples/Box2dTest/Box2dTest.vcxproj | 122 +++++++++++++++++++++ Build/Samples/Box2dTest/Box2dTest.vcxproj.filters | 17 +++ Build/Samples/Box2dTest/Box2dTest.vcxproj.user | 4 + .../Samples/ParticleEditor/ParticleEditor.vcxproj | 122 +++++++++++++++++++++ .../ParticleEditor/ParticleEditor.vcxproj.filters | 17 +++ .../ParticleEditor/ParticleEditor.vcxproj.user | 4 + Source/3rdParty/Luax/luax_memberref.h | 1 + Source/Asura.Editor/Source/Widgets/Button.h | 4 +- Source/Asura.Editor/source/widgets/button.h | 4 +- Source/Asura.Engine/Graphics/Shader.h | 2 +- .../graphics/binding/mesh2d_data.binding.cpp | 9 ++ .../graphics/binding/shader.binding.cpp | 44 ++++---- Source/Asura.Engine/graphics/mesh2d_data.cpp | 0 Source/Asura.Engine/graphics/mesh2d_data.h | 0 Source/Asura.Engine/graphics/shader.h | 2 +- Source/Asura.Engine/graphics/stb_decoder.h | 3 +- Source/Asura.Engine/scripting/portable.hpp | 11 +- Source/Asura.Engine/scripting/portable.inl | 3 +- 24 files changed, 371 insertions(+), 36 deletions(-) create mode 100644 Build/Samples/Box2dTest/Box2dTest.vcxproj create mode 100644 Build/Samples/Box2dTest/Box2dTest.vcxproj.filters create mode 100644 Build/Samples/Box2dTest/Box2dTest.vcxproj.user create mode 100644 Build/Samples/ParticleEditor/ParticleEditor.vcxproj create mode 100644 Build/Samples/ParticleEditor/ParticleEditor.vcxproj.filters create mode 100644 Build/Samples/ParticleEditor/ParticleEditor.vcxproj.user create mode 100644 Source/Asura.Engine/graphics/mesh2d_data.cpp create mode 100644 Source/Asura.Engine/graphics/mesh2d_data.h diff --git a/Bin/win64/LuaxTest.exe b/Bin/win64/LuaxTest.exe index 8aeac00..9a8058c 100644 Binary files a/Bin/win64/LuaxTest.exe and b/Bin/win64/LuaxTest.exe differ 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 @@ - + 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 @@ - - source - source\widgets @@ -89,5 +86,8 @@ source\widgets + + source + \ 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 @@ + @@ -213,6 +214,7 @@ + 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 @@ scripting + + graphics + @@ -335,6 +338,9 @@ scripting + + graphics + 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 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {0D704DBD-CF24-4F28-8CD8-106DDE6DEB0D} + Box2dTest + 10.0.17134.0 + + + + Application + true + v141 + MultiByte + + + Application + false + v141 + true + MultiByte + + + Application + true + v141 + MultiByte + + + Application + false + v141 + true + MultiByte + + + + + + + + + + + + + + + + + + + + + + + Level3 + Disabled + true + true + + + + + Level3 + Disabled + true + true + + + + + Level3 + MaxSpeed + true + true + true + true + + + true + true + + + + + Level3 + MaxSpeed + true + true + true + true + + + true + true + + + + + + + + \ 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 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + \ 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 @@ + + + + \ 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 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {74FFC4E1-F8A5-4F6A-AACF-CF1B28F21CBC} + ParticleEditor + 10.0.17134.0 + + + + Application + true + v141 + MultiByte + + + Application + false + v141 + true + MultiByte + + + Application + true + v141 + MultiByte + + + Application + false + v141 + true + MultiByte + + + + + + + + + + + + + + + + + + + + + + + Level3 + Disabled + true + true + + + + + Level3 + Disabled + true + true + + + + + Level3 + MaxSpeed + true + true + true + true + + + true + true + + + + + Level3 + MaxSpeed + true + true + true + true + + + true + true + + + + + + + + \ 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 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + \ 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 @@ + + + + \ 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