From 14c54b13021b8512f784fa9d943d7567f6ebf2f5 Mon Sep 17 00:00:00 2001 From: chai Date: Mon, 21 Jan 2019 20:26:33 +0800 Subject: *packer --- Build/3rdParty/lua51c/lua51c.vcxproj | 122 ++++++++++++++++++++ Build/3rdParty/lua51c/lua51c.vcxproj.filters | 2 + Build/3rdParty/lua51c/lua51c.vcxproj.user | 4 + .../Asura.Packer/Asura.Packer.vcxproj | 123 +++++++++++++++++++++ .../Asura.Packer/Asura.Packer.vcxproj.filters | 6 + .../Asura.Packer/Asura.Packer.vcxproj.user | 4 + Build/Asura.Editor/Asura.Editor.vcxproj | 8 +- Build/Asura.Editor/Asura.Editor.vcxproj.filters | 11 ++ Build/Asura.Engine/Asura.Engine.vcxproj | 9 +- Build/Asura.Engine/Asura.Engine.vcxproj.filters | 6 - Build/Asura.Framework/Asura.Framework.vcxproj | 9 +- .../Asura.Framework.vcxproj.filters | 7 ++ Build/Asura.Runner/Asura.Runner.vcxproj | 7 +- Build/Asura.sln | 21 ++++ "Docs/\350\256\260\345\275\225.docx" | Bin 18455 -> 18493 bytes Samples/Hello/gfx/particles.asset | 4 + Samples/Hello/sfx/a.ogg | 0 Samples/Hello/sfx/a.ogg.asset | 4 + Source/Asura.Editor/Scripts/main.lua | 3 + Source/Asura.Engine/Audio/Source.cpp | 0 Source/Asura.Engine/Audio/Source.h | 0 Source/Asura.Framework/Audio/SoundPlayer.lua | 3 + .../Asura.Framework/Filesystem/AnimationLoader.lua | 3 +- Source/Asura.Framework/Framework.lua | 1 + Source/Asura.Framework/Graphics/Animation.lua | 3 +- Source/Asura.Framework/Graphics/Camera.lua | 2 - Source/Asura.Framework/Graphics/Material.lua | 12 +- Source/Asura.Framework/Graphics/Renderer.lua | 3 + Source/Asura.Packer/main.cpp | 11 ++ Source/Asura.Runner/main.cpp | 4 +- 30 files changed, 372 insertions(+), 20 deletions(-) create mode 100644 Build/3rdParty/lua51c/lua51c.vcxproj create mode 100644 Build/3rdParty/lua51c/lua51c.vcxproj.filters create mode 100644 Build/3rdParty/lua51c/lua51c.vcxproj.user create mode 100644 Build/Asura.Compiler/Asura.Packer/Asura.Packer.vcxproj create mode 100644 Build/Asura.Compiler/Asura.Packer/Asura.Packer.vcxproj.filters create mode 100644 Build/Asura.Compiler/Asura.Packer/Asura.Packer.vcxproj.user create mode 100644 Samples/Hello/sfx/a.ogg create mode 100644 Samples/Hello/sfx/a.ogg.asset create mode 100644 Source/Asura.Editor/Scripts/main.lua delete mode 100644 Source/Asura.Engine/Audio/Source.cpp delete mode 100644 Source/Asura.Engine/Audio/Source.h create mode 100644 Source/Asura.Framework/Audio/SoundPlayer.lua create mode 100644 Source/Asura.Framework/Framework.lua create mode 100644 Source/Asura.Packer/main.cpp diff --git a/Build/3rdParty/lua51c/lua51c.vcxproj b/Build/3rdParty/lua51c/lua51c.vcxproj new file mode 100644 index 0000000..86cadd0 --- /dev/null +++ b/Build/3rdParty/lua51c/lua51c.vcxproj @@ -0,0 +1,122 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {B8F9616D-5393-4B34-B191-D200D1985439} + lua51c + 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/3rdParty/lua51c/lua51c.vcxproj.filters b/Build/3rdParty/lua51c/lua51c.vcxproj.filters new file mode 100644 index 0000000..9cd8510 --- /dev/null +++ b/Build/3rdParty/lua51c/lua51c.vcxproj.filters @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/Build/3rdParty/lua51c/lua51c.vcxproj.user b/Build/3rdParty/lua51c/lua51c.vcxproj.user new file mode 100644 index 0000000..be25078 --- /dev/null +++ b/Build/3rdParty/lua51c/lua51c.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Build/Asura.Compiler/Asura.Packer/Asura.Packer.vcxproj b/Build/Asura.Compiler/Asura.Packer/Asura.Packer.vcxproj new file mode 100644 index 0000000..a1869e3 --- /dev/null +++ b/Build/Asura.Compiler/Asura.Packer/Asura.Packer.vcxproj @@ -0,0 +1,123 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {6B47FB6E-4A0B-4B4E-9479-F2DA1F48BC07} + AsuraPacker + 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/Asura.Compiler/Asura.Packer/Asura.Packer.vcxproj.filters b/Build/Asura.Compiler/Asura.Packer/Asura.Packer.vcxproj.filters new file mode 100644 index 0000000..2c4b403 --- /dev/null +++ b/Build/Asura.Compiler/Asura.Packer/Asura.Packer.vcxproj.filters @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Build/Asura.Compiler/Asura.Packer/Asura.Packer.vcxproj.user b/Build/Asura.Compiler/Asura.Packer/Asura.Packer.vcxproj.user new file mode 100644 index 0000000..be25078 --- /dev/null +++ b/Build/Asura.Compiler/Asura.Packer/Asura.Packer.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Build/Asura.Editor/Asura.Editor.vcxproj b/Build/Asura.Editor/Asura.Editor.vcxproj index b08b448..7549f5b 100644 --- a/Build/Asura.Editor/Asura.Editor.vcxproj +++ b/Build/Asura.Editor/Asura.Editor.vcxproj @@ -69,7 +69,12 @@ - + + Asura Editor + + + Asura Editor + Level3 @@ -115,6 +120,7 @@ + diff --git a/Build/Asura.Editor/Asura.Editor.vcxproj.filters b/Build/Asura.Editor/Asura.Editor.vcxproj.filters index 289ae9c..16a2274 100644 --- a/Build/Asura.Editor/Asura.Editor.vcxproj.filters +++ b/Build/Asura.Editor/Asura.Editor.vcxproj.filters @@ -4,5 +4,16 @@ {99018b81-eb4c-423f-87ac-fe6ef75debb3} + + {df219ecb-2a99-443c-9313-5a6dc80a3255} + + + {d9c4718f-cf20-4282-acc4-9bc96e02907c} + + + + + Scripts + \ No newline at end of file diff --git a/Build/Asura.Engine/Asura.Engine.vcxproj b/Build/Asura.Engine/Asura.Engine.vcxproj index 8941533..d19cd79 100644 --- a/Build/Asura.Engine/Asura.Engine.vcxproj +++ b/Build/Asura.Engine/Asura.Engine.vcxproj @@ -69,7 +69,12 @@ - + + libasura + + + libasura + Level3 @@ -145,7 +150,6 @@ - @@ -190,7 +194,6 @@ - diff --git a/Build/Asura.Engine/Asura.Engine.vcxproj.filters b/Build/Asura.Engine/Asura.Engine.vcxproj.filters index 75b031c..179127c 100644 --- a/Build/Asura.Engine/Asura.Engine.vcxproj.filters +++ b/Build/Asura.Engine/Asura.Engine.vcxproj.filters @@ -51,9 +51,6 @@ Audio - - Audio - Containers @@ -175,9 +172,6 @@ Audio - - Audio - Containers diff --git a/Build/Asura.Framework/Asura.Framework.vcxproj b/Build/Asura.Framework/Asura.Framework.vcxproj index dce695a..a0da8ad 100644 --- a/Build/Asura.Framework/Asura.Framework.vcxproj +++ b/Build/Asura.Framework/Asura.Framework.vcxproj @@ -69,7 +69,12 @@ - + + asura_framework + + + asura_framework + Level3 @@ -116,6 +121,7 @@ + @@ -125,6 +131,7 @@ + diff --git a/Build/Asura.Framework/Asura.Framework.vcxproj.filters b/Build/Asura.Framework/Asura.Framework.vcxproj.filters index b669674..7d312e4 100644 --- a/Build/Asura.Framework/Asura.Framework.vcxproj.filters +++ b/Build/Asura.Framework/Asura.Framework.vcxproj.filters @@ -22,6 +22,9 @@ {4ffc0215-40d8-49a9-ac4a-4ab4a920cf4b} + + {9d892f8d-718b-4e11-a2ca-9f8448bb6a6a} + @@ -114,5 +117,9 @@ Math + + + Audio + \ No newline at end of file diff --git a/Build/Asura.Runner/Asura.Runner.vcxproj b/Build/Asura.Runner/Asura.Runner.vcxproj index 7f858a8..dfd4255 100644 --- a/Build/Asura.Runner/Asura.Runner.vcxproj +++ b/Build/Asura.Runner/Asura.Runner.vcxproj @@ -68,7 +68,12 @@ - + + Runner + + + Runner + Level3 diff --git a/Build/Asura.sln b/Build/Asura.sln index 626b6d0..fda449d 100644 --- a/Build/Asura.sln +++ b/Build/Asura.sln @@ -27,6 +27,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cembed", "cembed\cembed.vcx EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LuaJIT", "3rdParty\LuaJIT\LuaJIT.vcxproj", "{6F250ED2-F61B-4EB6-BF01-9AFE1409E8D4}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua51c", "3rdParty\lua51c\lua51c.vcxproj", "{B8F9616D-5393-4B34-B191-D200D1985439}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Asura.Packer", "Asura.Compiler\Asura.Packer\Asura.Packer.vcxproj", "{6B47FB6E-4A0B-4B4E-9479-F2DA1F48BC07}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -123,6 +127,22 @@ Global {6F250ED2-F61B-4EB6-BF01-9AFE1409E8D4}.Release|x64.Build.0 = Release|x64 {6F250ED2-F61B-4EB6-BF01-9AFE1409E8D4}.Release|x86.ActiveCfg = Release|Win32 {6F250ED2-F61B-4EB6-BF01-9AFE1409E8D4}.Release|x86.Build.0 = Release|Win32 + {B8F9616D-5393-4B34-B191-D200D1985439}.Debug|x64.ActiveCfg = Debug|x64 + {B8F9616D-5393-4B34-B191-D200D1985439}.Debug|x64.Build.0 = Debug|x64 + {B8F9616D-5393-4B34-B191-D200D1985439}.Debug|x86.ActiveCfg = Debug|Win32 + {B8F9616D-5393-4B34-B191-D200D1985439}.Debug|x86.Build.0 = Debug|Win32 + {B8F9616D-5393-4B34-B191-D200D1985439}.Release|x64.ActiveCfg = Release|x64 + {B8F9616D-5393-4B34-B191-D200D1985439}.Release|x64.Build.0 = Release|x64 + {B8F9616D-5393-4B34-B191-D200D1985439}.Release|x86.ActiveCfg = Release|Win32 + {B8F9616D-5393-4B34-B191-D200D1985439}.Release|x86.Build.0 = Release|Win32 + {6B47FB6E-4A0B-4B4E-9479-F2DA1F48BC07}.Debug|x64.ActiveCfg = Debug|x64 + {6B47FB6E-4A0B-4B4E-9479-F2DA1F48BC07}.Debug|x64.Build.0 = Debug|x64 + {6B47FB6E-4A0B-4B4E-9479-F2DA1F48BC07}.Debug|x86.ActiveCfg = Debug|Win32 + {6B47FB6E-4A0B-4B4E-9479-F2DA1F48BC07}.Debug|x86.Build.0 = Debug|Win32 + {6B47FB6E-4A0B-4B4E-9479-F2DA1F48BC07}.Release|x64.ActiveCfg = Release|x64 + {6B47FB6E-4A0B-4B4E-9479-F2DA1F48BC07}.Release|x64.Build.0 = Release|x64 + {6B47FB6E-4A0B-4B4E-9479-F2DA1F48BC07}.Release|x86.ActiveCfg = Release|Win32 + {6B47FB6E-4A0B-4B4E-9479-F2DA1F48BC07}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -132,6 +152,7 @@ Global {C0ED7D78-570B-454A-B3B6-576FDCB43D69} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} {8B8FCA14-FC8A-45B4-BF3C-9340CB586076} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} {6F250ED2-F61B-4EB6-BF01-9AFE1409E8D4} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} + {B8F9616D-5393-4B34-B191-D200D1985439} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {331032D8-F7CC-43E3-A03B-67108767F96B} diff --git "a/Docs/\350\256\260\345\275\225.docx" "b/Docs/\350\256\260\345\275\225.docx" index 28fbda8..aa2e5ff 100644 Binary files "a/Docs/\350\256\260\345\275\225.docx" and "b/Docs/\350\256\260\345\275\225.docx" differ diff --git a/Samples/Hello/gfx/particles.asset b/Samples/Hello/gfx/particles.asset index e69de29..90e9a40 100644 --- a/Samples/Hello/gfx/particles.asset +++ b/Samples/Hello/gfx/particles.asset @@ -0,0 +1,4 @@ +{ +type="particleeffecs", + +} \ No newline at end of file diff --git a/Samples/Hello/sfx/a.ogg b/Samples/Hello/sfx/a.ogg new file mode 100644 index 0000000..e69de29 diff --git a/Samples/Hello/sfx/a.ogg.asset b/Samples/Hello/sfx/a.ogg.asset new file mode 100644 index 0000000..18217d9 --- /dev/null +++ b/Samples/Hello/sfx/a.ogg.asset @@ -0,0 +1,4 @@ +{ +type="sound", +extern="a.ogg" +} \ No newline at end of file diff --git a/Source/Asura.Editor/Scripts/main.lua b/Source/Asura.Editor/Scripts/main.lua new file mode 100644 index 0000000..045e6c3 --- /dev/null +++ b/Source/Asura.Editor/Scripts/main.lua @@ -0,0 +1,3 @@ +local Editor = require("Asura.Editor") + + diff --git a/Source/Asura.Engine/Audio/Source.cpp b/Source/Asura.Engine/Audio/Source.cpp deleted file mode 100644 index e69de29..0000000 diff --git a/Source/Asura.Engine/Audio/Source.h b/Source/Asura.Engine/Audio/Source.h deleted file mode 100644 index e69de29..0000000 diff --git a/Source/Asura.Framework/Audio/SoundPlayer.lua b/Source/Asura.Framework/Audio/SoundPlayer.lua new file mode 100644 index 0000000..8bbeddb --- /dev/null +++ b/Source/Asura.Framework/Audio/SoundPlayer.lua @@ -0,0 +1,3 @@ +local SoundPlayer = AsuraEngine.Component.New("SoundPlayer") + +return SoundPlayer \ No newline at end of file diff --git a/Source/Asura.Framework/Filesystem/AnimationLoader.lua b/Source/Asura.Framework/Filesystem/AnimationLoader.lua index 5d19758..f1dee29 100644 --- a/Source/Asura.Framework/Filesystem/AnimationLoader.lua +++ b/Source/Asura.Framework/Filesystem/AnimationLoader.lua @@ -1,7 +1,8 @@ local AnimationLoader = AsuraEngine.Loader.New("animation") local AnimationManager = require "AnimationManager" +local Animation = require "Animation" -function AnimationLoader.Load(mat) +function AnimationLoader.Load(asset) local animation = AsuraEngine.Class() diff --git a/Source/Asura.Framework/Framework.lua b/Source/Asura.Framework/Framework.lua new file mode 100644 index 0000000..b465f78 --- /dev/null +++ b/Source/Asura.Framework/Framework.lua @@ -0,0 +1 @@ +require "" \ No newline at end of file diff --git a/Source/Asura.Framework/Graphics/Animation.lua b/Source/Asura.Framework/Graphics/Animation.lua index b73cdd8..8b52683 100644 --- a/Source/Asura.Framework/Graphics/Animation.lua +++ b/Source/Asura.Framework/Graphics/Animation.lua @@ -1,5 +1,6 @@ +--°Ñanimation asset¼ÓÈëĬÈÏ×ÊÔ´ local Animation = AsuraEngine.Asset.New("animation") -return Animation \ No newline at end of file +AsuraEngine.Animation = Animation \ No newline at end of file diff --git a/Source/Asura.Framework/Graphics/Camera.lua b/Source/Asura.Framework/Graphics/Camera.lua index 4c18f96..41d4394 100644 --- a/Source/Asura.Framework/Graphics/Camera.lua +++ b/Source/Asura.Framework/Graphics/Camera.lua @@ -4,6 +4,4 @@ Camera.mIsOnScreen = false Camera.mIsCulling = false - - return Camera \ No newline at end of file diff --git a/Source/Asura.Framework/Graphics/Material.lua b/Source/Asura.Framework/Graphics/Material.lua index 5875efc..5f7a7fa 100644 --- a/Source/Asura.Framework/Graphics/Material.lua +++ b/Source/Asura.Framework/Graphics/Material.lua @@ -4,14 +4,22 @@ local Material = AsuraEngine.Class() function Material:Ctor() - + end function Material:ToAsset() end -function Material:GetUniform() +function Material:GetUniform(id, value) + +end + +function Material:SendFloat() + +end + +function Material:GetUniformID() end diff --git a/Source/Asura.Framework/Graphics/Renderer.lua b/Source/Asura.Framework/Graphics/Renderer.lua index e69de29..1e44c73 100644 --- a/Source/Asura.Framework/Graphics/Renderer.lua +++ b/Source/Asura.Framework/Graphics/Renderer.lua @@ -0,0 +1,3 @@ +local Renderer = Class() + +return Renderer \ No newline at end of file diff --git a/Source/Asura.Packer/main.cpp b/Source/Asura.Packer/main.cpp new file mode 100644 index 0000000..71687d2 --- /dev/null +++ b/Source/Asura.Packer/main.cpp @@ -0,0 +1,11 @@ +/* +assets±àÒëÆ÷£¬×öÒÔÏÂÊÂÇ飺 +1) ɾ³ý½Å±¾ÖеÄ×¢ÊÍ +2) ɾ³ý½Å±¾ÖеÄAsuraEditorµ÷Óà +3) ѹËõ +*/ + +int main() +{ + +} \ No newline at end of file diff --git a/Source/Asura.Runner/main.cpp b/Source/Asura.Runner/main.cpp index 1e71d40..218b1a9 100644 --- a/Source/Asura.Runner/main.cpp +++ b/Source/Asura.Runner/main.cpp @@ -1,6 +1,6 @@ // ÓÎÏ·»á±»´ò°ü³ÉÒ»¸ö×ÊÔ´Îļþ£¬runner¶ÁÈ¡²¢½âÎöÄÚÈÝ£¬ÔËÐÐÓÎÏ· - +// RunnerÖ»ÄܶÁÈ¡ÓÉpacker´ò°üºóµÄÓÎÏ·Îļþ£¬editor¿ÉÒÔÖ±½ÓÔËÐÐÓÎÏ·assets¡£RunnerÊÇÒ»¸ö×îС»¯µÄÔËÐл·¾³¡£ int main() { -} +} \ No newline at end of file -- cgit v1.1-26-g67d0