diff options
26 files changed, 87 insertions, 105 deletions
diff --git a/Build/Asura.Engine/Asura.Engine.vcxproj b/Build/Asura.Engine/Asura.Engine.vcxproj index 15cd8ea..ec7d561 100644 --- a/Build/Asura.Engine/Asura.Engine.vcxproj +++ b/Build/Asura.Engine/Asura.Engine.vcxproj @@ -122,11 +122,7 @@ <ClInclude Include="..\..\Source\Asura.Engine\Containers\UnorderedMap.hpp" /> <ClInclude Include="..\..\Source\Asura.Engine\Containers\Vector.hpp" /> <ClInclude Include="..\..\Source\Asura.Engine\Factory.h" /> - <ClInclude Include="..\..\Source\Asura.Engine\FileSystem\AnimationImpoter.h" /> - <ClInclude Include="..\..\Source\Asura.Engine\FileSystem\ImageImpoter.h" /> <ClInclude Include="..\..\Source\Asura.Engine\FileSystem\Importer.h" /> - <ClInclude Include="..\..\Source\Asura.Engine\FileSystem\ParticleSystemImpoter.h" /> - <ClInclude Include="..\..\Source\Asura.Engine\FileSystem\SpriteImpoter.h" /> <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Animation.h" /> <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Canvas.h" /> <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Color.h" /> @@ -171,6 +167,12 @@ </ItemGroup> <ItemGroup> <ClCompile Include="..\..\Source\Asura.Engine\AI\StateMap.cpp" /> + <ClCompile Include="..\..\Source\Asura.Engine\FileSystem\Importer.Animation.cpp" /> + <ClCompile Include="..\..\Source\Asura.Engine\FileSystem\Importer.Asset.cpp" /> + <ClCompile Include="..\..\Source\Asura.Engine\FileSystem\Importer.cpp" /> + <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\Graphics\Canvas.cpp" /> <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Color.cpp" /> diff --git a/Build/Asura.Engine/Asura.Engine.vcxproj.filters b/Build/Asura.Engine/Asura.Engine.vcxproj.filters index 8ead2f8..d86417b 100644 --- a/Build/Asura.Engine/Asura.Engine.vcxproj.filters +++ b/Build/Asura.Engine/Asura.Engine.vcxproj.filters @@ -167,24 +167,12 @@ <Filter>Graphics</Filter> </ClInclude> <ClInclude Include="..\..\Source\Asura.Engine\Factory.h" /> - <ClInclude Include="..\..\Source\Asura.Engine\FileSystem\Importer.h"> - <Filter>FileSystem</Filter> - </ClInclude> - <ClInclude Include="..\..\Source\Asura.Engine\FileSystem\ImageImpoter.h"> - <Filter>FileSystem</Filter> - </ClInclude> - <ClInclude Include="..\..\Source\Asura.Engine\FileSystem\AnimationImpoter.h"> - <Filter>FileSystem</Filter> - </ClInclude> - <ClInclude Include="..\..\Source\Asura.Engine\FileSystem\ParticleSystemImpoter.h"> - <Filter>FileSystem</Filter> - </ClInclude> - <ClInclude Include="..\..\Source\Asura.Engine\FileSystem\SpriteImpoter.h"> - <Filter>FileSystem</Filter> - </ClInclude> <ClInclude Include="..\..\Source\Asura.Engine\AI\StateMap.h"> <Filter>AI</Filter> </ClInclude> + <ClInclude Include="..\..\Source\Asura.Engine\FileSystem\Importer.h"> + <Filter>FileSystem</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\Source\Asura.Engine\AI\BehaviorTree.cpp"> @@ -293,5 +281,23 @@ <ClCompile Include="..\..\Source\Asura.Engine\AI\StateMap.cpp"> <Filter>AI</Filter> </ClCompile> + <ClCompile Include="..\..\Source\Asura.Engine\FileSystem\Importer.Animation.cpp"> + <Filter>FileSystem</Filter> + </ClCompile> + <ClCompile Include="..\..\Source\Asura.Engine\FileSystem\Importer.Asset.cpp"> + <Filter>FileSystem</Filter> + </ClCompile> + <ClCompile Include="..\..\Source\Asura.Engine\FileSystem\Importer.Image.cpp"> + <Filter>FileSystem</Filter> + </ClCompile> + <ClCompile Include="..\..\Source\Asura.Engine\FileSystem\Importer.Sprite.cpp"> + <Filter>FileSystem</Filter> + </ClCompile> + <ClCompile Include="..\..\Source\Asura.Engine\FileSystem\Importer.cpp"> + <Filter>FileSystem</Filter> + </ClCompile> + <ClCompile Include="..\..\Source\Asura.Engine\FileSystem\Importer.StateMap.cpp"> + <Filter>FileSystem</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 3d4f04a..8672930 100644 --- a/Build/Asura.Framework/Asura.Framework.vcxproj +++ b/Build/Asura.Framework/Asura.Framework.vcxproj @@ -118,6 +118,7 @@ <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\GameObject.lua" /> <None Include="..\..\Source\Asura.Framework\Graphics\Animator.lua" /> <None Include="..\..\Source\Asura.Framework\Graphics\CanvasRenderer.lua" /> diff --git a/Build/Asura.Framework/Asura.Framework.vcxproj.filters b/Build/Asura.Framework/Asura.Framework.vcxproj.filters index a747f28..8284576 100644 --- a/Build/Asura.Framework/Asura.Framework.vcxproj.filters +++ b/Build/Asura.Framework/Asura.Framework.vcxproj.filters @@ -10,6 +10,9 @@ <Filter Include="AI"> <UniqueIdentifier>{ec999168-9049-4261-b25f-0849f622693e}</UniqueIdentifier> </Filter> + <Filter Include="Filesystem"> + <UniqueIdentifier>{19d37542-9fd8-4574-9a0b-4138478cc324}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> <None Include="..\..\Source\Asura.Framework\Graphics\Renderer.lua"> @@ -40,5 +43,8 @@ <None Include="..\..\Source\Asura.Framework\AI\StateMachine.lua"> <Filter>AI</Filter> </None> + <None Include="..\..\Source\Asura.Framework\Filesystem\Impoter.lua"> + <Filter>Filesystem</Filter> + </None> </ItemGroup> </Project>
\ No newline at end of file diff --git a/Docs/记录.docx b/Docs/记录.docx Binary files differindex fbe9233..419fc1d 100644 --- a/Docs/记录.docx +++ b/Docs/记录.docx diff --git a/Samples/Hello/gfx/icon.png.asr b/Samples/Hello/gfx/icon.png.asr index 93d6d58..7951698 100644 --- a/Samples/Hello/gfx/icon.png.asr +++ b/Samples/Hello/gfx/icon.png.asr @@ -1,3 +1,4 @@ <image> <extern>icon.png</extern> + <size>1</size> </image>
\ No newline at end of file diff --git a/Samples/Hello/gfx/mt_thunder.axm b/Samples/Hello/gfx/mt_thunder.axm new file mode 100644 index 0000000..a50afa1 --- /dev/null +++ b/Samples/Hello/gfx/mt_thunder.axm @@ -0,0 +1,3 @@ +<material> + <shader>/shaders/sh_thunder</shader> +</material>
\ No newline at end of file diff --git a/Samples/Hello/scripts/hello.lua.asr b/Samples/Hello/scripts/hello.lua.asr deleted file mode 100644 index 87e3c43..0000000 --- a/Samples/Hello/scripts/hello.lua.asr +++ /dev/null @@ -1,3 +0,0 @@ -<script> - <source>hello.lua</source> -</script>
\ No newline at end of file diff --git a/Samples/Hello/scripts/hello.lua.axm b/Samples/Hello/scripts/hello.lua.axm new file mode 100644 index 0000000..c1395fc --- /dev/null +++ b/Samples/Hello/scripts/hello.lua.axm @@ -0,0 +1,3 @@ +<script> + <extern>hello.lua</extern> +</script>
\ No newline at end of file diff --git a/Samples/Hello/scripts/tiledmapimporter.lua b/Samples/Hello/scripts/tiledmapimporter.lua new file mode 100644 index 0000000..244aceb --- /dev/null +++ b/Samples/Hello/scripts/tiledmapimporter.lua @@ -0,0 +1,7 @@ +local tiledMapImporter = AsuraEngine.Importer.New("tiledmap") --tiledmaptagtiledmap +local TiledMapManager = require "TiledMapManager.lua" +function tiledMapImporter:Load( data ) + +end + +return tiledMapImporter
\ No newline at end of file diff --git a/Samples/Hello/scripts/tiledmapimporter.lua.axm b/Samples/Hello/scripts/tiledmapimporter.lua.axm new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Samples/Hello/scripts/tiledmapimporter.lua.axm diff --git a/Samples/Hello/shaders/sh_thunder.axm b/Samples/Hello/shaders/sh_thunder.axm new file mode 100644 index 0000000..e7ec04b --- /dev/null +++ b/Samples/Hello/shaders/sh_thunder.axm @@ -0,0 +1,4 @@ +<shader> + <vertex>default.vert</vertex> + <fragment>thunder.frag</fragment> +</shader>
\ No newline at end of file diff --git a/Source/Asura.Engine/FileSystem/AnimationImpoter.h b/Source/Asura.Engine/FileSystem/AnimationImpoter.h deleted file mode 100644 index 57fdfdb..0000000 --- a/Source/Asura.Engine/FileSystem/AnimationImpoter.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef __AE_IMAGE_IMPORTER_H__ -#define __AE_IMAGE_IMPORTER_H___ - -namespace AsuraEngine -{ - namespace Filesystem - { - - /// - /// .asranimation - /// - class AnimationImporter - { - - }; - - } -} - -#endif
\ No newline at end of file diff --git a/Source/Asura.Engine/FileSystem/Asset.h b/Source/Asura.Engine/FileSystem/Asset.h index 9fc6607..e96d36b 100644 --- a/Source/Asura.Engine/FileSystem/Asset.h +++ b/Source/Asura.Engine/FileSystem/Asset.h @@ -9,7 +9,7 @@ namespace AsuraEngine { /// - /// AssetΪ + /// AssetΪһassetļжȡ /// class Asset : public Object { diff --git a/Source/Asura.Engine/FileSystem/ImageImpoter.h b/Source/Asura.Engine/FileSystem/ImageImpoter.h deleted file mode 100644 index ca7cb9a..0000000 --- a/Source/Asura.Engine/FileSystem/ImageImpoter.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef __AE_IMAGE_IMPORTER_H__ -#define __AE_IMAGE_IMPORTER_H___ - -namespace AsuraEngine -{ - namespace Filesystem - { - - /// - /// .asrimage - /// - class ImageImporter - { - - }; - - } -} - -#endif
\ No newline at end of file diff --git a/Source/Asura.Engine/FileSystem/Importer.Animation.cpp b/Source/Asura.Engine/FileSystem/Importer.Animation.cpp new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Source/Asura.Engine/FileSystem/Importer.Animation.cpp diff --git a/Source/Asura.Engine/FileSystem/Importer.Asset.cpp b/Source/Asura.Engine/FileSystem/Importer.Asset.cpp new file mode 100644 index 0000000..0af7436 --- /dev/null +++ b/Source/Asura.Engine/FileSystem/Importer.Asset.cpp @@ -0,0 +1,3 @@ +#include "Importer.h" + +// ԶԴ diff --git a/Source/Asura.Engine/FileSystem/Importer.Image.cpp b/Source/Asura.Engine/FileSystem/Importer.Image.cpp new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Source/Asura.Engine/FileSystem/Importer.Image.cpp diff --git a/Source/Asura.Engine/FileSystem/Importer.Sprite.cpp b/Source/Asura.Engine/FileSystem/Importer.Sprite.cpp new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Source/Asura.Engine/FileSystem/Importer.Sprite.cpp diff --git a/Source/Asura.Engine/FileSystem/Importer.StateMap.cpp b/Source/Asura.Engine/FileSystem/Importer.StateMap.cpp new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Source/Asura.Engine/FileSystem/Importer.StateMap.cpp diff --git a/Source/Asura.Engine/FileSystem/Importer.cpp b/Source/Asura.Engine/FileSystem/Importer.cpp new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Source/Asura.Engine/FileSystem/Importer.cpp diff --git a/Source/Asura.Engine/FileSystem/Importer.h b/Source/Asura.Engine/FileSystem/Importer.h index b343a92..16689e9 100644 --- a/Source/Asura.Engine/FileSystem/Importer.h +++ b/Source/Asura.Engine/FileSystem/Importer.h @@ -6,6 +6,10 @@ namespace AsuraEngine namespace Filesystem { + /// + /// ⲿԴΪAssetڸԴmanagerͬimporterǸ.asrļĸtagimage + /// importImage룬assetimportAsset롣ԶԴûָimporterasset롣 + /// class Importer { diff --git a/Source/Asura.Engine/FileSystem/ParticleSystemImpoter.h b/Source/Asura.Engine/FileSystem/ParticleSystemImpoter.h deleted file mode 100644 index 92796f3..0000000 --- a/Source/Asura.Engine/FileSystem/ParticleSystemImpoter.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef __AE_IMAGE_IMPORTER_H__ -#define __AE_IMAGE_IMPORTER_H___ - -namespace AsuraEngine -{ - namespace Filesystem - { - - /// - /// .asrparticle system - /// - class ParticleSystemImporter - { - - }; - - } -} - -#endif
\ No newline at end of file diff --git a/Source/Asura.Engine/FileSystem/SpriteImpoter.h b/Source/Asura.Engine/FileSystem/SpriteImpoter.h deleted file mode 100644 index 0e157c1..0000000 --- a/Source/Asura.Engine/FileSystem/SpriteImpoter.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef __AE_IMAGE_IMPORTER_H__ -#define __AE_IMAGE_IMPORTER_H___ - -namespace AsuraEngine -{ - namespace Filesystem - { - - /// - /// .asrsprite - /// - class SpriteImporter - { - - }; - - } -} - -#endif
\ No newline at end of file diff --git a/Source/Asura.Framework/Filesystem/Impoter.lua b/Source/Asura.Framework/Filesystem/Impoter.lua new file mode 100644 index 0000000..fbbd68a --- /dev/null +++ b/Source/Asura.Framework/Filesystem/Impoter.lua @@ -0,0 +1,22 @@ +--[[ +࣬ԶԴ̳ͨдർ롣ԶԴıǷ +<asset> + <extern>./resource.maptile</extern> +</asset> +ָ˵impoter֮ԶԴͨз: +<maptile> + <extern>./resource.maptile</extern> +</maptile> +ʹöӦڲԴ͵importerԴ + +]] + +local importer = Class() + +function importer:InnerResource( data ) + + + +end + +return importer
\ No newline at end of file diff --git a/Source/Asura.Framework/Graphics/Animator.lua b/Source/Asura.Framework/Graphics/Animator.lua index eb33e49..1dca9f4 100644 --- a/Source/Asura.Framework/Graphics/Animator.lua +++ b/Source/Asura.Framework/Graphics/Animator.lua @@ -1,11 +1,14 @@ -local Animator = Class() +local Animator = Class(function(go) + self.gameobject = go + self.spriteRenderer = go:GetSpriteRenderer() +end) Animator.animation = AsuraEngine.Animation.None local animation = AsuraEngine.Animation.New() function Animator:OnUpdate(dt) - + end function Animator:OnRender() |
