diff options
68 files changed, 384 insertions, 81 deletions
diff --git a/Build/Asura.Editor/Asura.Editor.vcxproj.filters b/Build/Asura.Editor/Asura.Editor.vcxproj.filters index 9cd8510..289ae9c 100644 --- a/Build/Asura.Editor/Asura.Editor.vcxproj.filters +++ b/Build/Asura.Editor/Asura.Editor.vcxproj.filters @@ -1,2 +1,8 @@ <?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 +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Plugins"> + <UniqueIdentifier>{99018b81-eb4c-423f-87ac-fe6ef75debb3}</UniqueIdentifier> + </Filter> + </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 ec7d561..8941533 100644 --- a/Build/Asura.Engine/Asura.Engine.vcxproj +++ b/Build/Asura.Engine/Asura.Engine.vcxproj @@ -123,13 +123,13 @@ <ClInclude Include="..\..\Source\Asura.Engine\Containers\Vector.hpp" /> <ClInclude Include="..\..\Source\Asura.Engine\Factory.h" /> <ClInclude Include="..\..\Source\Asura.Engine\FileSystem\Importer.h" /> - <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Animation.h" /> + <ClInclude Include="..\..\Source\Asura.Engine\FileSystem\Loader.h" /> <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Canvas.h" /> <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Color.h" /> <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Image.h" /> <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Mesh2D.h" /> <ClInclude Include="..\..\Source\Asura.Engine\Graphics\OpenGL.h" /> - <ClInclude Include="..\..\Source\Asura.Engine\Graphics\ParticleSystem.h" /> + <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Shape.h" /> <ClInclude Include="..\..\Source\Asura.Engine\Graphics\SpriteBatch.h" /> <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Texture.h" /> <ClInclude Include="..\..\Source\Asura.Engine\Manager.hpp" /> @@ -153,7 +153,6 @@ <ClInclude Include="..\..\Source\Asura.Engine\Exceptions\Exception.h" /> <ClInclude Include="..\..\Source\Asura.Engine\FileSystem\Asset.h" /> <ClInclude Include="..\..\Source\Asura.Engine\Font\TrueTypeFont.h" /> - <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Material.h" /> <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Shader.h" /> <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Sprite.h" /> <ClInclude Include="..\..\Source\Asura.Engine\Input\Keyboard.h" /> @@ -173,13 +172,13 @@ <ClCompile Include="..\..\Source\Asura.Engine\FileSystem\Importer.Image.cpp" /> <ClCompile Include="..\..\Source\Asura.Engine\FileSystem\Importer.Sprite.cpp" /> <ClCompile Include="..\..\Source\Asura.Engine\FileSystem\Importer.StateMap.cpp" /> - <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Animation.cpp" /> + <ClCompile Include="..\..\Source\Asura.Engine\FileSystem\Loader.cpp" /> <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Canvas.cpp" /> <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Color.cpp" /> <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Image.cpp" /> <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Mesh2D.cpp" /> <ClCompile Include="..\..\Source\Asura.Engine\Graphics\OpenGL.cpp" /> - <ClCompile Include="..\..\Source\Asura.Engine\Graphics\ParticleSystem.cpp" /> + <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Shape.cpp" /> <ClCompile Include="..\..\Source\Asura.Engine\Graphics\SpriteBatch.cpp" /> <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Texture.cpp" /> <ClCompile Include="..\..\Source\Asura.Engine\Math\Curve.cpp" /> @@ -199,7 +198,6 @@ <ClCompile Include="..\..\Source\Asura.Engine\Exceptions\Exception.cpp" /> <ClCompile Include="..\..\Source\Asura.Engine\FileSystem\Asset.cpp" /> <ClCompile Include="..\..\Source\Asura.Engine\Font\TrueTypeFont.cpp" /> - <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Material.cpp" /> <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Shader.cpp" /> <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Sprite.cpp" /> <ClCompile Include="..\..\Source\Asura.Engine\Input\Keyboard.cpp" /> diff --git a/Build/Asura.Engine/Asura.Engine.vcxproj.filters b/Build/Asura.Engine/Asura.Engine.vcxproj.filters index d86417b..75b031c 100644 --- a/Build/Asura.Engine/Asura.Engine.vcxproj.filters +++ b/Build/Asura.Engine/Asura.Engine.vcxproj.filters @@ -34,18 +34,12 @@ <Filter Include="Time"> <UniqueIdentifier>{aa1d8502-8fee-4b39-bbc9-be198224bb73}</UniqueIdentifier> </Filter> - <Filter Include="Graphics\Effects"> - <UniqueIdentifier>{79d850d4-08da-483f-8771-fa4f7663d261}</UniqueIdentifier> - </Filter> <Filter Include="Scripting"> <UniqueIdentifier>{9dcab30a-6b0b-4f4c-9fc1-330f333da238}</UniqueIdentifier> </Filter> <Filter Include="Physics"> <UniqueIdentifier>{f94a816c-f744-4d8b-aa3b-0d1c32e388ba}</UniqueIdentifier> </Filter> - <Filter Include="Graphics\Animation"> - <UniqueIdentifier>{e62bd4f3-5f4b-43fc-9d1e-bb3913e33e40}</UniqueIdentifier> - </Filter> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\Source\Asura.Engine\AI\BehaviorTree.h"> @@ -78,9 +72,6 @@ <ClInclude Include="..\..\Source\Asura.Engine\Font\TrueTypeFont.h"> <Filter>Font</Filter> </ClInclude> - <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Material.h"> - <Filter>Graphics</Filter> - </ClInclude> <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Shader.h"> <Filter>Graphics</Filter> </ClInclude> @@ -138,12 +129,6 @@ <ClInclude Include="..\..\Source\Asura.Engine\Scripting\Luax.hpp"> <Filter>Scripting</Filter> </ClInclude> - <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Animation.h"> - <Filter>Graphics\Animation</Filter> - </ClInclude> - <ClInclude Include="..\..\Source\Asura.Engine\Graphics\ParticleSystem.h"> - <Filter>Graphics\Effects</Filter> - </ClInclude> <ClInclude Include="..\..\Source\Asura.Engine\Graphics\SpriteBatch.h"> <Filter>Graphics</Filter> </ClInclude> @@ -173,6 +158,12 @@ <ClInclude Include="..\..\Source\Asura.Engine\FileSystem\Importer.h"> <Filter>FileSystem</Filter> </ClInclude> + <ClInclude Include="..\..\Source\Asura.Engine\FileSystem\Loader.h"> + <Filter>FileSystem</Filter> + </ClInclude> + <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Shape.h"> + <Filter>Graphics</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\Source\Asura.Engine\AI\BehaviorTree.cpp"> @@ -208,9 +199,6 @@ <ClCompile Include="..\..\Source\Asura.Engine\Font\TrueTypeFont.cpp"> <Filter>Font</Filter> </ClCompile> - <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Material.cpp"> - <Filter>Graphics</Filter> - </ClCompile> <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Shader.cpp"> <Filter>Graphics</Filter> </ClCompile> @@ -254,12 +242,6 @@ <ClCompile Include="..\..\Source\Asura.Engine\Graphics\OpenGL.cpp"> <Filter>Graphics</Filter> </ClCompile> - <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Animation.cpp"> - <Filter>Graphics\Animation</Filter> - </ClCompile> - <ClCompile Include="..\..\Source\Asura.Engine\Graphics\ParticleSystem.cpp"> - <Filter>Graphics\Effects</Filter> - </ClCompile> <ClCompile Include="..\..\Source\Asura.Engine\Graphics\SpriteBatch.cpp"> <Filter>Graphics</Filter> </ClCompile> @@ -299,5 +281,11 @@ <ClCompile Include="..\..\Source\Asura.Engine\FileSystem\Importer.StateMap.cpp"> <Filter>FileSystem</Filter> </ClCompile> + <ClCompile Include="..\..\Source\Asura.Engine\FileSystem\Loader.cpp"> + <Filter>FileSystem</Filter> + </ClCompile> + <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Shape.cpp"> + <Filter>Graphics</Filter> + </ClCompile> </ItemGroup> </Project>
\ No newline at end of file diff --git a/Build/Asura.Framework/Asura.Framework.vcxproj b/Build/Asura.Framework/Asura.Framework.vcxproj index 8672930..9b187d7 100644 --- a/Build/Asura.Framework/Asura.Framework.vcxproj +++ b/Build/Asura.Framework/Asura.Framework.vcxproj @@ -118,15 +118,35 @@ <None Include="..\..\Source\Asura.Framework\AI\StateMachine.lua" /> <None Include="..\..\Source\Asura.Framework\Class.lua" /> <None Include="..\..\Source\Asura.Framework\Component.lua" /> - <None Include="..\..\Source\Asura.Framework\Filesystem\Impoter.lua" /> + <None Include="..\..\Source\Asura.Framework\Filesystem\AnimationLoader.lua" /> + <None Include="..\..\Source\Asura.Framework\Filesystem\GameObjectLoader.lua" /> + <None Include="..\..\Source\Asura.Framework\Filesystem\Loader.lua" /> + <None Include="..\..\Source\Asura.Framework\Filesystem\MaterialLoader.lua" /> + <None Include="..\..\Source\Asura.Framework\Filesystem\PathLoader.lua" /> + <None Include="..\..\Source\Asura.Framework\Filesystem\PrefabLoader.lua" /> + <None Include="..\..\Source\Asura.Framework\Filesystem\SceneLoader.lua" /> <None Include="..\..\Source\Asura.Framework\GameObject.lua" /> + <None Include="..\..\Source\Asura.Framework\Graphics\Animation.lua" /> <None Include="..\..\Source\Asura.Framework\Graphics\Animator.lua" /> + <None Include="..\..\Source\Asura.Framework\Graphics\Camera.lua" /> <None Include="..\..\Source\Asura.Framework\Graphics\CanvasRenderer.lua" /> + <None Include="..\..\Source\Asura.Framework\Graphics\DefaultShaders.lua" /> + <None Include="..\..\Source\Asura.Framework\Graphics\Material.lua" /> + <None Include="..\..\Source\Asura.Framework\Graphics\MaterialManager.lua" /> <None Include="..\..\Source\Asura.Framework\Graphics\Mesh2DRenderer.lua" /> <None Include="..\..\Source\Asura.Framework\Graphics\ParticleSystem.lua" /> + <None Include="..\..\Source\Asura.Framework\Graphics\ParticleSystemManager.lua" /> <None Include="..\..\Source\Asura.Framework\Graphics\Renderer.lua" /> + <None Include="..\..\Source\Asura.Framework\Graphics\ShapeRenderer.lua" /> + <None Include="..\..\Source\Asura.Framework\Graphics\SpriteBatchRenderer.lua" /> <None Include="..\..\Source\Asura.Framework\Graphics\SpriteRenderer.lua" /> + <None Include="..\..\Source\Asura.Framework\GUI\Button.lua" /> + <None Include="..\..\Source\Asura.Framework\GUI\Text.lua" /> + <None Include="..\..\Source\Asura.Framework\Math\Curve.lua" /> <None Include="..\..\Source\Asura.Framework\Object.lua" /> + <None Include="..\..\Source\Asura.Framework\Path\Path.lua" /> + <None Include="..\..\Source\Asura.Framework\Path\PathCalculator.lua" /> + <None Include="..\..\Source\Asura.Framework\Path\PathManager.lua" /> <None Include="..\..\Source\Asura.Framework\Prefab.lua" /> <None Include="..\..\Source\Asura.Framework\Scene.lua" /> <None Include="..\..\Source\Asura.Framework\Transform.lua" /> diff --git a/Build/Asura.Framework/Asura.Framework.vcxproj.filters b/Build/Asura.Framework/Asura.Framework.vcxproj.filters index 8284576..4d7ac53 100644 --- a/Build/Asura.Framework/Asura.Framework.vcxproj.filters +++ b/Build/Asura.Framework/Asura.Framework.vcxproj.filters @@ -13,6 +13,15 @@ <Filter Include="Filesystem"> <UniqueIdentifier>{19d37542-9fd8-4574-9a0b-4138478cc324}</UniqueIdentifier> </Filter> + <Filter Include="GUI"> + <UniqueIdentifier>{ed48783f-af1d-408b-9c4c-27370a7afc69}</UniqueIdentifier> + </Filter> + <Filter Include="Path"> + <UniqueIdentifier>{24457f19-3650-4efc-8a02-aae600f9a463}</UniqueIdentifier> + </Filter> + <Filter Include="Math"> + <UniqueIdentifier>{4ffc0215-40d8-49a9-ac4a-4ab4a920cf4b}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> <None Include="..\..\Source\Asura.Framework\Graphics\Renderer.lua"> @@ -43,8 +52,68 @@ <None Include="..\..\Source\Asura.Framework\AI\StateMachine.lua"> <Filter>AI</Filter> </None> - <None Include="..\..\Source\Asura.Framework\Filesystem\Impoter.lua"> + <None Include="..\..\Source\Asura.Framework\GUI\Button.lua"> + <Filter>GUI</Filter> + </None> + <None Include="..\..\Source\Asura.Framework\Filesystem\Loader.lua"> + <Filter>Filesystem</Filter> + </None> + <None Include="..\..\Source\Asura.Framework\Graphics\Material.lua"> + <Filter>Graphics</Filter> + </None> + <None Include="..\..\Source\Asura.Framework\Filesystem\MaterialLoader.lua"> <Filter>Filesystem</Filter> </None> + <None Include="..\..\Source\Asura.Framework\Graphics\MaterialManager.lua"> + <Filter>Graphics</Filter> + </None> + <None Include="..\..\Source\Asura.Framework\Graphics\Animation.lua"> + <Filter>Graphics</Filter> + </None> + <None Include="..\..\Source\Asura.Framework\Graphics\Camera.lua"> + <Filter>Graphics</Filter> + </None> + <None Include="..\..\Source\Asura.Framework\Graphics\ShapeRenderer.lua"> + <Filter>Graphics</Filter> + </None> + <None Include="..\..\Source\Asura.Framework\Graphics\SpriteBatchRenderer.lua"> + <Filter>Graphics</Filter> + </None> + <None Include="..\..\Source\Asura.Framework\Filesystem\AnimationLoader.lua"> + <Filter>Filesystem</Filter> + </None> + <None Include="..\..\Source\Asura.Framework\Path\Path.lua"> + <Filter>Path</Filter> + </None> + <None Include="..\..\Source\Asura.Framework\Filesystem\PathLoader.lua"> + <Filter>Filesystem</Filter> + </None> + <None Include="..\..\Source\Asura.Framework\Path\PathCalculator.lua"> + <Filter>Path</Filter> + </None> + <None Include="..\..\Source\Asura.Framework\Path\PathManager.lua"> + <Filter>Path</Filter> + </None> + <None Include="..\..\Source\Asura.Framework\Filesystem\GameObjectLoader.lua"> + <Filter>Filesystem</Filter> + </None> + <None Include="..\..\Source\Asura.Framework\Filesystem\PrefabLoader.lua"> + <Filter>Filesystem</Filter> + </None> + <None Include="..\..\Source\Asura.Framework\Filesystem\SceneLoader.lua"> + <Filter>Filesystem</Filter> + </None> + <None Include="..\..\Source\Asura.Framework\Graphics\ParticleSystemManager.lua"> + <Filter>Graphics</Filter> + </None> + <None Include="..\..\Source\Asura.Framework\GUI\Text.lua"> + <Filter>GUI</Filter> + </None> + <None Include="..\..\Source\Asura.Framework\Graphics\DefaultShaders.lua"> + <Filter>Graphics</Filter> + </None> + <None Include="..\..\Source\Asura.Framework\Math\Curve.lua"> + <Filter>Math</Filter> + </None> </ItemGroup> </Project>
\ No newline at end of file diff --git a/Docs/记录.docx b/Docs/记录.docx Binary files differindex 419fc1d..25b00b3 100644 --- a/Docs/记录.docx +++ b/Docs/记录.docx diff --git a/Samples/Hello/entities/anim.asset b/Samples/Hello/entities/anim.asset new file mode 100644 index 0000000..966098f --- /dev/null +++ b/Samples/Hello/entities/anim.asset @@ -0,0 +1,4 @@ +{ +type="animation", + +}
\ No newline at end of file diff --git a/Samples/Hello/entities/player.asr b/Samples/Hello/entities/player.asr deleted file mode 100644 index fa7550d..0000000 --- a/Samples/Hello/entities/player.asr +++ /dev/null @@ -1,5 +0,0 @@ -<gameobject> - <components> - <component></component> - </components> -</gameobject>
\ No newline at end of file diff --git a/Samples/Hello/entities/player.asset b/Samples/Hello/entities/player.asset new file mode 100644 index 0000000..7415a9c --- /dev/null +++ b/Samples/Hello/entities/player.asset @@ -0,0 +1,8 @@ +{ +type="gameobject", +components={ + "/scripts/components/fireball.lua", + "/scripts/components/fly.lua", + "/scripts/components/move.lua", +}, +}
\ No newline at end of file diff --git a/Samples/Hello/gfx/icon.png.asr b/Samples/Hello/gfx/icon.png.asr deleted file mode 100644 index 7951698..0000000 --- a/Samples/Hello/gfx/icon.png.asr +++ /dev/null @@ -1,4 +0,0 @@ -<image> - <extern>icon.png</extern> - <size>1</size> -</image>
\ No newline at end of file diff --git a/Samples/Hello/gfx/icon.png.asset b/Samples/Hello/gfx/icon.png.asset new file mode 100644 index 0000000..83a5b60 --- /dev/null +++ b/Samples/Hello/gfx/icon.png.asset @@ -0,0 +1,4 @@ +{ +type="image", +extern="icon.png" +}
\ No newline at end of file diff --git a/Samples/Hello/gfx/mt_thunder.asset b/Samples/Hello/gfx/mt_thunder.asset new file mode 100644 index 0000000..05a051a --- /dev/null +++ b/Samples/Hello/gfx/mt_thunder.asset @@ -0,0 +1,4 @@ +{ +type="material", +shader="/shaders/sh_thunder", +}
\ No newline at end of file diff --git a/Samples/Hello/gfx/mt_thunder.axm b/Samples/Hello/gfx/mt_thunder.axm deleted file mode 100644 index a50afa1..0000000 --- a/Samples/Hello/gfx/mt_thunder.axm +++ /dev/null @@ -1,3 +0,0 @@ -<material> - <shader>/shaders/sh_thunder</shader> -</material>
\ No newline at end of file diff --git a/Samples/Hello/gfx/particles/fire.asr b/Samples/Hello/gfx/particles/fire.asr deleted file mode 100644 index eae2506..0000000 --- a/Samples/Hello/gfx/particles/fire.asr +++ /dev/null @@ -1,4 +0,0 @@ -<!--ϵͳ--> -<particlesystem> - -</particlesystem>
\ No newline at end of file diff --git a/Samples/Hello/gfx/particles/fire.asset b/Samples/Hello/gfx/particles/fire.asset new file mode 100644 index 0000000..d20e4ad --- /dev/null +++ b/Samples/Hello/gfx/particles/fire.asset @@ -0,0 +1,4 @@ +{ +type="particlesystem", + +}
\ No newline at end of file diff --git a/Samples/Hello/gfx/test.animation.asset b/Samples/Hello/gfx/test.animation.asset new file mode 100644 index 0000000..89ca0df --- /dev/null +++ b/Samples/Hello/gfx/test.animation.asset @@ -0,0 +1,14 @@ +{ +type="animation", +duration=3, +loop=true, +update_sprite=true, +update_transform=false, +key_frames=4, +frames={ + {time=0.0,sprite="/sprites/hero_0.spr"}, + {time=0.1,sprite="/sprites/hero_1.spr"}, + {time=0.2,sprite="/sprites/hero_2.spr"}, + {time=1.0,sprite="/sprites/hero_3.spr"}, +}, +}
\ No newline at end of file diff --git a/Samples/Hello/hello.asuraproject b/Samples/Hello/hello.asuraproject index fee1eb1..158e3d9 100644 --- a/Samples/Hello/hello.asuraproject +++ b/Samples/Hello/hello.asuraproject @@ -1,2 +1,3 @@ -<folders> -</folders>
\ No newline at end of file +{ +projectname="hello", +}
\ No newline at end of file diff --git a/Samples/Hello/loaders/tiledmap_loader.lua b/Samples/Hello/loaders/tiledmap_loader.lua new file mode 100644 index 0000000..5c0e9ef --- /dev/null +++ b/Samples/Hello/loaders/tiledmap_loader.lua @@ -0,0 +1,13 @@ +local TiledMapLoader = Class() +local TiledMapManager = require("/managers/TiledMapManager") + +function TiledMapLoader:Load(asset, tiledmap) + if asset.type ~= "tiledmap" then + return nil + end + + + +end + +return TiledMapLoader
\ No newline at end of file diff --git a/Samples/Hello/scripts/components/fireball.lua.asr b/Samples/Hello/loaders/tiledmap_loader.lua.asset index e69de29..e69de29 100644 --- a/Samples/Hello/scripts/components/fireball.lua.asr +++ b/Samples/Hello/loaders/tiledmap_loader.lua.asset diff --git a/Samples/Hello/scripts/components/fireball.lua.asset b/Samples/Hello/scripts/components/fireball.lua.asset new file mode 100644 index 0000000..7789dfe --- /dev/null +++ b/Samples/Hello/scripts/components/fireball.lua.asset @@ -0,0 +1,4 @@ +{ +type="script", +extern="fireball.lua", +}
\ No newline at end of file diff --git a/Samples/Hello/scripts/entities/spark.lua.asr b/Samples/Hello/scripts/components/fly.lua index e69de29..e69de29 100644 --- a/Samples/Hello/scripts/entities/spark.lua.asr +++ b/Samples/Hello/scripts/components/fly.lua diff --git a/Samples/Hello/scripts/tiledmapimporter.lua.axm b/Samples/Hello/scripts/components/fly.lua.asset index e69de29..e69de29 100644 --- a/Samples/Hello/scripts/tiledmapimporter.lua.axm +++ b/Samples/Hello/scripts/components/fly.lua.asset diff --git a/Source/Asura.Engine/GUI/Button.cpp b/Samples/Hello/scripts/components/move.lua index e69de29..e69de29 100644 --- a/Source/Asura.Engine/GUI/Button.cpp +++ b/Samples/Hello/scripts/components/move.lua diff --git a/Samples/Hello/scripts/components/move.lua.asset b/Samples/Hello/scripts/components/move.lua.asset new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Samples/Hello/scripts/components/move.lua.asset diff --git a/Samples/Hello/scripts/entities/bullet.lua.asr b/Samples/Hello/scripts/entities/bullet.lua.asr deleted file mode 100644 index bd43c00..0000000 --- a/Samples/Hello/scripts/entities/bullet.lua.asr +++ /dev/null @@ -1,3 +0,0 @@ -<script> - <extern>bullet.lua</extern> -</script>
\ No newline at end of file diff --git a/Samples/Hello/scripts/entities/bullet.lua.asset b/Samples/Hello/scripts/entities/bullet.lua.asset new file mode 100644 index 0000000..adf32e0 --- /dev/null +++ b/Samples/Hello/scripts/entities/bullet.lua.asset @@ -0,0 +1,4 @@ +{ +type="script", +extern="bullet.lua" +}
\ No newline at end of file diff --git a/Samples/Hello/scripts/entities/spark.lua.asset b/Samples/Hello/scripts/entities/spark.lua.asset new file mode 100644 index 0000000..abeee56 --- /dev/null +++ b/Samples/Hello/scripts/entities/spark.lua.asset @@ -0,0 +1,4 @@ +{ +type="script", +extern="spark.lua" +}
\ No newline at end of file diff --git a/Samples/Hello/scripts/hello.lua.asset b/Samples/Hello/scripts/hello.lua.asset new file mode 100644 index 0000000..00bde24 --- /dev/null +++ b/Samples/Hello/scripts/hello.lua.asset @@ -0,0 +1,4 @@ +{ +type="script", +extern="hello.lua" +}
\ No newline at end of file diff --git a/Samples/Hello/scripts/hello.lua.axm b/Samples/Hello/scripts/hello.lua.axm deleted file mode 100644 index c1395fc..0000000 --- a/Samples/Hello/scripts/hello.lua.axm +++ /dev/null @@ -1,3 +0,0 @@ -<script> - <extern>hello.lua</extern> -</script>
\ No newline at end of file diff --git a/Samples/Hello/scripts/material_loader.lua b/Samples/Hello/scripts/material_loader.lua new file mode 100644 index 0000000..628ca3b --- /dev/null +++ b/Samples/Hello/scripts/material_loader.lua @@ -0,0 +1,16 @@ +local MaterialLoader = AsuraEngine.Importer.New("material") +local MaterialManager = require "MaterialManager.lua" + +function MaterialLoader.Load(mat) + local shader = AsuraEngine.Shader.GetShader(mat.shader) + if shader == nil then + shader = AsuraEngine.Shader.New(mat.shader) + if shader == nil then + return nil + end + end + local material = AsuraEngine.Class() + return material +end + +return MaterialLoader
\ No newline at end of file diff --git a/Samples/Hello/scripts/material_loader.lua.asset b/Samples/Hello/scripts/material_loader.lua.asset new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Samples/Hello/scripts/material_loader.lua.asset diff --git a/Samples/Hello/scripts/tiledmapimporter.lua b/Samples/Hello/scripts/tiledmapimporter.lua index 244aceb..782c840 100644 --- a/Samples/Hello/scripts/tiledmapimporter.lua +++ b/Samples/Hello/scripts/tiledmapimporter.lua @@ -1,7 +1,9 @@ -local tiledMapImporter = AsuraEngine.Importer.New("tiledmap") --tiledmaptagtiledmap +local TiledMapLoader = AsuraEngine.Importer.New("tiledmap") --tiledmaptagtiledmap local TiledMapManager = require "TiledMapManager.lua" -function tiledMapImporter:Load( data ) +function TiledMapLoader:Load( asset, data ) + + end -return tiledMapImporter
\ No newline at end of file +return TiledMapLoader
\ No newline at end of file diff --git a/Samples/Hello/scripts/tiledmapimporter.lua.asset b/Samples/Hello/scripts/tiledmapimporter.lua.asset new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Samples/Hello/scripts/tiledmapimporter.lua.asset diff --git a/Samples/Hello/shaders/sh_thunder.asset b/Samples/Hello/shaders/sh_thunder.asset new file mode 100644 index 0000000..86cb35a --- /dev/null +++ b/Samples/Hello/shaders/sh_thunder.asset @@ -0,0 +1,15 @@ +{ +type="shader", +vertex=[[ +void main() +{ + +} +]], +fragment=[[ +void main() +{ + +} +]] +}
\ No newline at end of file diff --git a/Samples/Hello/shaders/sh_thunder.axm b/Samples/Hello/shaders/sh_thunder.axm deleted file mode 100644 index e7ec04b..0000000 --- a/Samples/Hello/shaders/sh_thunder.axm +++ /dev/null @@ -1,4 +0,0 @@ -<shader> - <vertex>default.vert</vertex> - <fragment>thunder.frag</fragment> -</shader>
\ No newline at end of file diff --git a/Samples/Hello/spr/spr_image.asr b/Samples/Hello/spr/spr_image.asr deleted file mode 100644 index 91be3a3..0000000 --- a/Samples/Hello/spr/spr_image.asr +++ /dev/null @@ -1,6 +0,0 @@ -<sprite> - <image>gfx/icon.png</image> - <name>spr_image</name> - <size>12,32</size> - <anchor>10,10</anchor> -</sprite>
\ No newline at end of file diff --git a/Samples/Hello/sprite/spr_image.asset b/Samples/Hello/sprite/spr_image.asset new file mode 100644 index 0000000..7b29e05 --- /dev/null +++ b/Samples/Hello/sprite/spr_image.asset @@ -0,0 +1,7 @@ +{ +type="sprite", +image="/gfx/icon.png", +size={12,32}, +anchor={10,10}, +quad={0,0,10,10} +}
\ No newline at end of file diff --git a/Samples/Hello/tiledmap/boat.tiledmap b/Samples/Hello/tiledmap/boat.tiledmap new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Samples/Hello/tiledmap/boat.tiledmap diff --git a/Samples/Hello/tiledmap/boat.tiledmap.asset b/Samples/Hello/tiledmap/boat.tiledmap.asset new file mode 100644 index 0000000..b1feb62 --- /dev/null +++ b/Samples/Hello/tiledmap/boat.tiledmap.asset @@ -0,0 +1,4 @@ +{ +type="asset", --Ĭϵasset +extern="boat.tiledmap" +}
\ No newline at end of file diff --git a/Samples/Hello/tiledmap/boat.tiledmap2.asset b/Samples/Hello/tiledmap/boat.tiledmap2.asset new file mode 100644 index 0000000..e502ccd --- /dev/null +++ b/Samples/Hello/tiledmap/boat.tiledmap2.asset @@ -0,0 +1,4 @@ +{ +type="tiledmap", --typeҵloaderѴassetexternݴ +extern="boat.tiledmap" +}
\ No newline at end of file diff --git a/Source/Asura.Engine/FileSystem/Loader.cpp b/Source/Asura.Engine/FileSystem/Loader.cpp new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Source/Asura.Engine/FileSystem/Loader.cpp diff --git a/Source/Asura.Engine/FileSystem/Loader.h b/Source/Asura.Engine/FileSystem/Loader.h new file mode 100644 index 0000000..2846c69 --- /dev/null +++ b/Source/Asura.Engine/FileSystem/Loader.h @@ -0,0 +1,20 @@ +#ifndef __AE_LOADER_H__ +#define __AE_LOADER_H__ + +namespace AsuraEngine +{ + namespace Filesystem + { + + /// + /// Դloader + /// + class Loader + { + + }; + + } +} + +#endif
\ No newline at end of file diff --git a/Source/Asura.Engine/GUI/README.md b/Source/Asura.Engine/GUI/README.md deleted file mode 100644 index 3e367c7..0000000 --- a/Source/Asura.Engine/GUI/README.md +++ /dev/null @@ -1 +0,0 @@ -immediate mode game gui
\ No newline at end of file diff --git a/Source/Asura.Engine/Graphics/Canvas.h b/Source/Asura.Engine/Graphics/Canvas.h index cd78194..7f70e7c 100644 --- a/Source/Asura.Engine/Graphics/Canvas.h +++ b/Source/Asura.Engine/Graphics/Canvas.h @@ -11,6 +11,13 @@ namespace AsuraEngine class Canvas : public Texture, public Component { + public: + + + + private: + + }; diff --git a/Source/Asura.Engine/Graphics/Material.h b/Source/Asura.Engine/Graphics/Material.h index 1cb3c88..68dfa1e 100644 --- a/Source/Asura.Engine/Graphics/Material.h +++ b/Source/Asura.Engine/Graphics/Material.h @@ -160,13 +160,13 @@ namespace AsuraEngine /// /// еimage /// - Containers::Map<uint, Image*> mImages; + Containers::Map<uint, Material*> mMaterials; /// /// image·IDӳ䡣Դ.asrimageͨ·õimageԲеimageڴmapС /// ɳimageֻͨIDȡԳҪID /// - Containers::StringMap<uint> mImageIDs; + Containers::StringMap<uint> mMaterialIDs; }; diff --git a/Source/Asura.Engine/Graphics/Shape.cpp b/Source/Asura.Engine/Graphics/Shape.cpp new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Source/Asura.Engine/Graphics/Shape.cpp diff --git a/Source/Asura.Engine/Graphics/Shape.h b/Source/Asura.Engine/Graphics/Shape.h new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Source/Asura.Engine/Graphics/Shape.h diff --git a/Source/Asura.Framework/Component.lua b/Source/Asura.Framework/Component.lua index 54bd3c7..027c066 100644 --- a/Source/Asura.Framework/Component.lua +++ b/Source/Asura.Framework/Component.lua @@ -1,9 +1,21 @@ +local Component = Class() -local Component = Class(function() - self.gameobject = nil +Component.gameobject = AsuraEngine.Type.GameObject -end) +function Component:Ctor(go) + self.gameobject = go +end -Component.gameobject = AsuraEngine.Type.GameObject +function Component:OnEvent(e) + +end + +function Component:OnUpdate(ms) + +end + +function Component:OnDraw() + +end -return Component +return Component
\ No newline at end of file diff --git a/Source/Asura.Framework/Filesystem/AnimationLoader.lua b/Source/Asura.Framework/Filesystem/AnimationLoader.lua new file mode 100644 index 0000000..5d19758 --- /dev/null +++ b/Source/Asura.Framework/Filesystem/AnimationLoader.lua @@ -0,0 +1,10 @@ +local AnimationLoader = AsuraEngine.Loader.New("animation") +local AnimationManager = require "AnimationManager" + +function AnimationLoader.Load(mat) + + local animation = AsuraEngine.Class() + +end + +return AnimationLoader
\ No newline at end of file diff --git a/Source/Asura.Framework/Filesystem/GameObjectLoader.lua b/Source/Asura.Framework/Filesystem/GameObjectLoader.lua new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Source/Asura.Framework/Filesystem/GameObjectLoader.lua diff --git a/Source/Asura.Framework/Filesystem/Impoter.lua b/Source/Asura.Framework/Filesystem/Loader.lua index fbbd68a..fbbd68a 100644 --- a/Source/Asura.Framework/Filesystem/Impoter.lua +++ b/Source/Asura.Framework/Filesystem/Loader.lua diff --git a/Source/Asura.Framework/Filesystem/MaterialLoader.lua b/Source/Asura.Framework/Filesystem/MaterialLoader.lua new file mode 100644 index 0000000..8ecfa51 --- /dev/null +++ b/Source/Asura.Framework/Filesystem/MaterialLoader.lua @@ -0,0 +1,10 @@ +local MaterialLoader = AsuraEngine.Loader.New("material") +local MaterialManager = require "MaterialManager" + +function MaterialLoader.Load(mat) + + + +end + +return MaterialLoader
\ No newline at end of file diff --git a/Source/Asura.Framework/Filesystem/PathLoader.lua b/Source/Asura.Framework/Filesystem/PathLoader.lua new file mode 100644 index 0000000..b9112df --- /dev/null +++ b/Source/Asura.Framework/Filesystem/PathLoader.lua @@ -0,0 +1,11 @@ +local PathLoader = AsuraEngine.Loader.New("path") +local PathManager = require "Path/PathManager" + +function PathLoader.Load(asset) + if asset.type ~= "path" then + return nil + end + +end + +return Path
\ No newline at end of file diff --git a/Source/Asura.Framework/Filesystem/PrefabLoader.lua b/Source/Asura.Framework/Filesystem/PrefabLoader.lua new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Source/Asura.Framework/Filesystem/PrefabLoader.lua diff --git a/Source/Asura.Framework/Filesystem/SceneLoader.lua b/Source/Asura.Framework/Filesystem/SceneLoader.lua new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Source/Asura.Framework/Filesystem/SceneLoader.lua diff --git a/Source/Asura.Framework/GUI/Button.lua b/Source/Asura.Framework/GUI/Button.lua new file mode 100644 index 0000000..a63cc01 --- /dev/null +++ b/Source/Asura.Framework/GUI/Button.lua @@ -0,0 +1,7 @@ +-- Ϸimgui + +local Button = AsuraEngine.Component.Extend("Button") + + + +return Button
\ No newline at end of file diff --git a/Source/Asura.Framework/GUI/Text.lua b/Source/Asura.Framework/GUI/Text.lua new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Source/Asura.Framework/GUI/Text.lua diff --git a/Source/Asura.Framework/GameObject.lua b/Source/Asura.Framework/GameObject.lua index 358ba14..1b328ca 100644 --- a/Source/Asura.Framework/GameObject.lua +++ b/Source/Asura.Framework/GameObject.lua @@ -1,4 +1,4 @@ -local GameObject = Class() +local GameObject = AsuraEngine.Asset.SubClass("GameObject") function GameObject:OnEnable() @@ -8,7 +8,7 @@ function GameObject:OnEvent(e) end -function GameObject:OnUpdate() +function GameObject:OnUpdate(dt) end @@ -52,4 +52,8 @@ function GameObject:SetRotation() end +function GameObject:ToAsset() + +end + return GameObject
\ No newline at end of file diff --git a/Source/Asura.Framework/Graphics/Animation.lua b/Source/Asura.Framework/Graphics/Animation.lua new file mode 100644 index 0000000..b73cdd8 --- /dev/null +++ b/Source/Asura.Framework/Graphics/Animation.lua @@ -0,0 +1,5 @@ +local Animation = AsuraEngine.Asset.New("animation") + + + +return Animation
\ No newline at end of file diff --git a/Source/Asura.Framework/Graphics/DefaultShaders.lua b/Source/Asura.Framework/Graphics/DefaultShaders.lua new file mode 100644 index 0000000..bd54cb9 --- /dev/null +++ b/Source/Asura.Framework/Graphics/DefaultShaders.lua @@ -0,0 +1,5 @@ +--[[ +õshaders. +]] + + diff --git a/Source/Asura.Framework/Graphics/Material.lua b/Source/Asura.Framework/Graphics/Material.lua new file mode 100644 index 0000000..5875efc --- /dev/null +++ b/Source/Asura.Framework/Graphics/Material.lua @@ -0,0 +1,18 @@ +--[[ +ʣǶshaderĴ +]] +local Material = AsuraEngine.Class() + +function Material:Ctor() + +end + +function Material:ToAsset() + +end + +function Material:GetUniform() + +end + +return Material
\ No newline at end of file diff --git a/Source/Asura.Framework/Graphics/MaterialManager.lua b/Source/Asura.Framework/Graphics/MaterialManager.lua new file mode 100644 index 0000000..46cc13d --- /dev/null +++ b/Source/Asura.Framework/Graphics/MaterialManager.lua @@ -0,0 +1,5 @@ +local MaterialManager = AsuraEngine.Manager.New() + + + +return MaterialManager
\ No newline at end of file diff --git a/Source/Asura.Framework/Graphics/ParticleSystemManager.lua b/Source/Asura.Framework/Graphics/ParticleSystemManager.lua new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Source/Asura.Framework/Graphics/ParticleSystemManager.lua diff --git a/Source/Asura.Framework/Math/Curve.lua b/Source/Asura.Framework/Math/Curve.lua new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Source/Asura.Framework/Math/Curve.lua diff --git a/Source/Asura.Framework/Path/Path.lua b/Source/Asura.Framework/Path/Path.lua new file mode 100644 index 0000000..3b6079d --- /dev/null +++ b/Source/Asura.Framework/Path/Path.lua @@ -0,0 +1,13 @@ +local Path = AsuraEngine.Asset.New("path") + +function Path:Ctor() + +end + +-- ToAssetѶpathתΪ.assetļʽ +function Path.ToAsset(path) + local builder = AsuraEngine.AssetBuilder.Get() + +end + +return Path
\ No newline at end of file diff --git a/Source/Asura.Framework/Path/PathCalculator.lua b/Source/Asura.Framework/Path/PathCalculator.lua new file mode 100644 index 0000000..1a564b8 --- /dev/null +++ b/Source/Asura.Framework/Path/PathCalculator.lua @@ -0,0 +1,12 @@ +--[[ +ڱ༭componentsб +]] +local PathCalculator = AsuraEngine.Component.New("PathCalculator") + +PathCalculator.path = AsuraEngine.Asset.Type("path", "·") + +function PathCalculator:ctor(path) + self.path = path +end + +return PathCalculator
\ No newline at end of file diff --git a/Source/Asura.Framework/Path/PathManager.lua b/Source/Asura.Framework/Path/PathManager.lua new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Source/Asura.Framework/Path/PathManager.lua diff --git a/Source/Asura.Framework/README.md b/Source/Asura.Framework/README.md index 10a5290..c803f1f 100644 --- a/Source/Asura.Framework/README.md +++ b/Source/Asura.Framework/README.md @@ -1,3 +1,3 @@ -AsuraFrameworkǿܣʹECSģʽ +AsuraFrameworkǿܣʹECSģʽչasset |
