From 0c65330f29d214cdfd810e83096669c5f2c20bee Mon Sep 17 00:00:00 2001 From: chai Date: Sun, 20 Jan 2019 19:42:03 +0800 Subject: *misc --- Build/Asura.Editor/Asura.Editor.vcxproj.filters | 8 ++- Build/Asura.Engine/Asura.Engine.vcxproj | 10 ++- Build/Asura.Engine/Asura.Engine.vcxproj.filters | 36 ++++------- Build/Asura.Framework/Asura.Framework.vcxproj | 22 ++++++- .../Asura.Framework.vcxproj.filters | 71 ++++++++++++++++++++- "Docs/\350\256\260\345\275\225.docx" | Bin 14777 -> 14977 bytes Samples/Hello/entities/anim.asset | 4 ++ Samples/Hello/entities/player.asr | 5 -- Samples/Hello/entities/player.asset | 8 +++ Samples/Hello/gfx/icon.png.asr | 4 -- Samples/Hello/gfx/icon.png.asset | 4 ++ Samples/Hello/gfx/mt_thunder.asset | 4 ++ Samples/Hello/gfx/mt_thunder.axm | 3 - Samples/Hello/gfx/particles/fire.asr | 4 -- Samples/Hello/gfx/particles/fire.asset | 4 ++ Samples/Hello/gfx/test.animation.asset | 14 ++++ Samples/Hello/hello.asuraproject | 5 +- Samples/Hello/loaders/tiledmap_loader.lua | 13 ++++ Samples/Hello/loaders/tiledmap_loader.lua.asset | 0 Samples/Hello/scripts/components/fireball.lua.asr | 0 .../Hello/scripts/components/fireball.lua.asset | 4 ++ Samples/Hello/scripts/components/fly.lua | 0 Samples/Hello/scripts/components/fly.lua.asset | 0 Samples/Hello/scripts/components/move.lua | 0 Samples/Hello/scripts/components/move.lua.asset | 0 Samples/Hello/scripts/entities/bullet.lua.asr | 3 - Samples/Hello/scripts/entities/bullet.lua.asset | 4 ++ Samples/Hello/scripts/entities/spark.lua.asr | 0 Samples/Hello/scripts/entities/spark.lua.asset | 4 ++ Samples/Hello/scripts/hello.lua.asset | 4 ++ Samples/Hello/scripts/hello.lua.axm | 3 - Samples/Hello/scripts/material_loader.lua | 16 +++++ Samples/Hello/scripts/material_loader.lua.asset | 0 Samples/Hello/scripts/tiledmapimporter.lua | 8 ++- Samples/Hello/scripts/tiledmapimporter.lua.asset | 0 Samples/Hello/scripts/tiledmapimporter.lua.axm | 0 Samples/Hello/shaders/sh_thunder.asset | 15 +++++ Samples/Hello/shaders/sh_thunder.axm | 4 -- Samples/Hello/spr/spr_image.asr | 6 -- Samples/Hello/sprite/spr_image.asset | 7 ++ Samples/Hello/tiledmap/boat.tiledmap | 0 Samples/Hello/tiledmap/boat.tiledmap.asset | 4 ++ Samples/Hello/tiledmap/boat.tiledmap2.asset | 4 ++ Source/Asura.Engine/FileSystem/Loader.cpp | 0 Source/Asura.Engine/FileSystem/Loader.h | 20 ++++++ Source/Asura.Engine/GUI/Button.cpp | 0 Source/Asura.Engine/GUI/README.md | 1 - Source/Asura.Engine/Graphics/Canvas.h | 7 ++ Source/Asura.Engine/Graphics/Material.h | 4 +- Source/Asura.Engine/Graphics/Shape.cpp | 0 Source/Asura.Engine/Graphics/Shape.h | 0 Source/Asura.Framework/Component.lua | 22 +++++-- .../Asura.Framework/Filesystem/AnimationLoader.lua | 10 +++ .../Filesystem/GameObjectLoader.lua | 0 Source/Asura.Framework/Filesystem/Impoter.lua | 22 ------- Source/Asura.Framework/Filesystem/Loader.lua | 22 +++++++ .../Asura.Framework/Filesystem/MaterialLoader.lua | 10 +++ Source/Asura.Framework/Filesystem/PathLoader.lua | 11 ++++ Source/Asura.Framework/Filesystem/PrefabLoader.lua | 0 Source/Asura.Framework/Filesystem/SceneLoader.lua | 0 Source/Asura.Framework/GUI/Button.lua | 7 ++ Source/Asura.Framework/GUI/Text.lua | 0 Source/Asura.Framework/GameObject.lua | 8 ++- Source/Asura.Framework/Graphics/Animation.lua | 5 ++ Source/Asura.Framework/Graphics/DefaultShaders.lua | 5 ++ Source/Asura.Framework/Graphics/Material.lua | 18 ++++++ .../Asura.Framework/Graphics/MaterialManager.lua | 5 ++ .../Graphics/ParticleSystemManager.lua | 0 Source/Asura.Framework/Math/Curve.lua | 0 Source/Asura.Framework/Path/Path.lua | 13 ++++ Source/Asura.Framework/Path/PathCalculator.lua | 12 ++++ Source/Asura.Framework/Path/PathManager.lua | 0 Source/Asura.Framework/README.md | 2 +- 73 files changed, 406 insertions(+), 103 deletions(-) create mode 100644 Samples/Hello/entities/anim.asset delete mode 100644 Samples/Hello/entities/player.asr create mode 100644 Samples/Hello/entities/player.asset delete mode 100644 Samples/Hello/gfx/icon.png.asr create mode 100644 Samples/Hello/gfx/icon.png.asset create mode 100644 Samples/Hello/gfx/mt_thunder.asset delete mode 100644 Samples/Hello/gfx/mt_thunder.axm delete mode 100644 Samples/Hello/gfx/particles/fire.asr create mode 100644 Samples/Hello/gfx/particles/fire.asset create mode 100644 Samples/Hello/gfx/test.animation.asset create mode 100644 Samples/Hello/loaders/tiledmap_loader.lua create mode 100644 Samples/Hello/loaders/tiledmap_loader.lua.asset delete mode 100644 Samples/Hello/scripts/components/fireball.lua.asr create mode 100644 Samples/Hello/scripts/components/fireball.lua.asset create mode 100644 Samples/Hello/scripts/components/fly.lua create mode 100644 Samples/Hello/scripts/components/fly.lua.asset create mode 100644 Samples/Hello/scripts/components/move.lua create mode 100644 Samples/Hello/scripts/components/move.lua.asset delete mode 100644 Samples/Hello/scripts/entities/bullet.lua.asr create mode 100644 Samples/Hello/scripts/entities/bullet.lua.asset delete mode 100644 Samples/Hello/scripts/entities/spark.lua.asr create mode 100644 Samples/Hello/scripts/entities/spark.lua.asset create mode 100644 Samples/Hello/scripts/hello.lua.asset delete mode 100644 Samples/Hello/scripts/hello.lua.axm create mode 100644 Samples/Hello/scripts/material_loader.lua create mode 100644 Samples/Hello/scripts/material_loader.lua.asset create mode 100644 Samples/Hello/scripts/tiledmapimporter.lua.asset delete mode 100644 Samples/Hello/scripts/tiledmapimporter.lua.axm create mode 100644 Samples/Hello/shaders/sh_thunder.asset delete mode 100644 Samples/Hello/shaders/sh_thunder.axm delete mode 100644 Samples/Hello/spr/spr_image.asr create mode 100644 Samples/Hello/sprite/spr_image.asset create mode 100644 Samples/Hello/tiledmap/boat.tiledmap create mode 100644 Samples/Hello/tiledmap/boat.tiledmap.asset create mode 100644 Samples/Hello/tiledmap/boat.tiledmap2.asset create mode 100644 Source/Asura.Engine/FileSystem/Loader.cpp create mode 100644 Source/Asura.Engine/FileSystem/Loader.h delete mode 100644 Source/Asura.Engine/GUI/Button.cpp delete mode 100644 Source/Asura.Engine/GUI/README.md create mode 100644 Source/Asura.Engine/Graphics/Shape.cpp create mode 100644 Source/Asura.Engine/Graphics/Shape.h create mode 100644 Source/Asura.Framework/Filesystem/AnimationLoader.lua create mode 100644 Source/Asura.Framework/Filesystem/GameObjectLoader.lua delete mode 100644 Source/Asura.Framework/Filesystem/Impoter.lua create mode 100644 Source/Asura.Framework/Filesystem/Loader.lua create mode 100644 Source/Asura.Framework/Filesystem/MaterialLoader.lua create mode 100644 Source/Asura.Framework/Filesystem/PathLoader.lua create mode 100644 Source/Asura.Framework/Filesystem/PrefabLoader.lua create mode 100644 Source/Asura.Framework/Filesystem/SceneLoader.lua create mode 100644 Source/Asura.Framework/GUI/Button.lua create mode 100644 Source/Asura.Framework/GUI/Text.lua create mode 100644 Source/Asura.Framework/Graphics/Animation.lua create mode 100644 Source/Asura.Framework/Graphics/DefaultShaders.lua create mode 100644 Source/Asura.Framework/Graphics/Material.lua create mode 100644 Source/Asura.Framework/Graphics/MaterialManager.lua create mode 100644 Source/Asura.Framework/Graphics/ParticleSystemManager.lua create mode 100644 Source/Asura.Framework/Math/Curve.lua create mode 100644 Source/Asura.Framework/Path/Path.lua create mode 100644 Source/Asura.Framework/Path/PathCalculator.lua create mode 100644 Source/Asura.Framework/Path/PathManager.lua 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 @@  - \ No newline at end of file + + + + {99018b81-eb4c-423f-87ac-fe6ef75debb3} + + + \ 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 @@ - + - + @@ -153,7 +153,6 @@ - @@ -173,13 +172,13 @@ - + - + @@ -199,7 +198,6 @@ - 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 @@ {aa1d8502-8fee-4b39-bbc9-be198224bb73} - - {79d850d4-08da-483f-8771-fa4f7663d261} - {9dcab30a-6b0b-4f4c-9fc1-330f333da238} {f94a816c-f744-4d8b-aa3b-0d1c32e388ba} - - {e62bd4f3-5f4b-43fc-9d1e-bb3913e33e40} - @@ -78,9 +72,6 @@ Font - - Graphics - Graphics @@ -138,12 +129,6 @@ Scripting - - Graphics\Animation - - - Graphics\Effects - Graphics @@ -173,6 +158,12 @@ FileSystem + + FileSystem + + + Graphics + @@ -208,9 +199,6 @@ Font - - Graphics - Graphics @@ -254,12 +242,6 @@ Graphics - - Graphics\Animation - - - Graphics\Effects - Graphics @@ -299,5 +281,11 @@ FileSystem + + FileSystem + + + Graphics + \ 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 @@ - + + + + + + + + + + + + + + + + + + + + + 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 @@ {19d37542-9fd8-4574-9a0b-4138478cc324} + + {ed48783f-af1d-408b-9c4c-27370a7afc69} + + + {24457f19-3650-4efc-8a02-aae600f9a463} + + + {4ffc0215-40d8-49a9-ac4a-4ab4a920cf4b} + @@ -43,8 +52,68 @@ AI - + + GUI + + + Filesystem + + + Graphics + + Filesystem + + Graphics + + + Graphics + + + Graphics + + + Graphics + + + Graphics + + + Filesystem + + + Path + + + Filesystem + + + Path + + + Path + + + Filesystem + + + Filesystem + + + Filesystem + + + Graphics + + + GUI + + + Graphics + + + Math + \ No newline at end of file diff --git "a/Docs/\350\256\260\345\275\225.docx" "b/Docs/\350\256\260\345\275\225.docx" index 419fc1d..25b00b3 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/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 @@ - - - - - \ 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 @@ - - icon.png - 1 - \ 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 @@ - - /shaders/sh_thunder - \ 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 @@ - - - - \ 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 @@ - - \ 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/loaders/tiledmap_loader.lua.asset b/Samples/Hello/loaders/tiledmap_loader.lua.asset new file mode 100644 index 0000000..e69de29 diff --git a/Samples/Hello/scripts/components/fireball.lua.asr b/Samples/Hello/scripts/components/fireball.lua.asr deleted file mode 100644 index e69de29..0000000 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/components/fly.lua b/Samples/Hello/scripts/components/fly.lua new file mode 100644 index 0000000..e69de29 diff --git a/Samples/Hello/scripts/components/fly.lua.asset b/Samples/Hello/scripts/components/fly.lua.asset new file mode 100644 index 0000000..e69de29 diff --git a/Samples/Hello/scripts/components/move.lua b/Samples/Hello/scripts/components/move.lua new file mode 100644 index 0000000..e69de29 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 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 @@ - \ 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.asr b/Samples/Hello/scripts/entities/spark.lua.asr deleted file mode 100644 index e69de29..0000000 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 @@ - \ 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 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") --tiledmapÊÇtag£¬±íÃ÷ÁËtiledmap +local TiledMapLoader = AsuraEngine.Importer.New("tiledmap") --tiledmapÊÇtag£¬±íÃ÷ÁËtiledmap 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 diff --git a/Samples/Hello/scripts/tiledmapimporter.lua.axm b/Samples/Hello/scripts/tiledmapimporter.lua.axm deleted file mode 100644 index e69de29..0000000 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 @@ - - default.vert - thunder.frag - \ 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 @@ - - gfx/icon.png - spr_image - 12,32 - 10,10 - \ 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 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£¬°Ñ´ËassetºÍexternÄÚÈÝ´«Èë +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 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/Button.cpp b/Source/Asura.Engine/GUI/Button.cpp deleted file mode 100644 index e69de29..0000000 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 mImages; + Containers::Map mMaterials; /// /// image£¬Â·¾¶ºÍIDµÄÓ³Éä¡£Õë¶Ô´Ó.asrµ¼ÈëµÄimage£¬Í¨¹ý·¾¶¿ÉÒÔÄõ½image¡£ËùÒÔ²¢²»ÊÇËùÓеÄimage¶¼ÔÚ´ËmapÖС£ /// ÓɳÌÐò´´½¨µÄimageÖ»ÄÜͨ¹ýIDÀ´»ñÈ¡£¬ËùÒÔ³ÌÐòÖÐÐèÒª±£ÁôID¡£ /// - Containers::StringMap mImageIDs; + Containers::StringMap mMaterialIDs; }; diff --git a/Source/Asura.Engine/Graphics/Shape.cpp b/Source/Asura.Engine/Graphics/Shape.cpp new file mode 100644 index 0000000..e69de29 diff --git a/Source/Asura.Engine/Graphics/Shape.h b/Source/Asura.Engine/Graphics/Shape.h new file mode 100644 index 0000000..e69de29 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 diff --git a/Source/Asura.Framework/Filesystem/Impoter.lua b/Source/Asura.Framework/Filesystem/Impoter.lua deleted file mode 100644 index fbbd68a..0000000 --- a/Source/Asura.Framework/Filesystem/Impoter.lua +++ /dev/null @@ -1,22 +0,0 @@ ---[[ -»ùÀ࣬×Ô¶¨ÒåµÄ×ÊÔ´¿ÉÒÔͨ¹ý¼Ì³Ð´ËÀർÈë¡£×Ô¶¨ÒåµÄ×ÊÔ´µÄ±ê¼Ç·½·¨£º - - ./resource.maptile - -ÔÚÖ¸¶¨Á˵¼ÈëimpoterÖ®ºó£¬×Ô¶¨ÒåµÄ×ÊÔ´ÔÊÐíͨ¹ýÏÂÁз½·¨±ê¼Ç: - - ./resource.maptile - -ÒýÇæ»áʹÓöÔÓ¦ÄÚ²¿×ÊÔ´ÀàÐ͵Äimporterµ¼Èë×ÊÔ´ - -]] - -local importer = Class() - -function importer:InnerResource( data ) - - - -end - -return importer \ No newline at end of file diff --git a/Source/Asura.Framework/Filesystem/Loader.lua b/Source/Asura.Framework/Filesystem/Loader.lua new file mode 100644 index 0000000..fbbd68a --- /dev/null +++ b/Source/Asura.Framework/Filesystem/Loader.lua @@ -0,0 +1,22 @@ +--[[ +»ùÀ࣬×Ô¶¨ÒåµÄ×ÊÔ´¿ÉÒÔͨ¹ý¼Ì³Ð´ËÀർÈë¡£×Ô¶¨ÒåµÄ×ÊÔ´µÄ±ê¼Ç·½·¨£º + + ./resource.maptile + +ÔÚÖ¸¶¨Á˵¼ÈëimpoterÖ®ºó£¬×Ô¶¨ÒåµÄ×ÊÔ´ÔÊÐíͨ¹ýÏÂÁз½·¨±ê¼Ç: + + ./resource.maptile + +ÒýÇæ»áʹÓöÔÓ¦ÄÚ²¿×ÊÔ´ÀàÐ͵Äimporterµ¼Èë×ÊÔ´ + +]] + +local importer = Class() + +function importer:InnerResource( data ) + + + +end + +return importer \ No newline at end of file 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 diff --git a/Source/Asura.Framework/Filesystem/SceneLoader.lua b/Source/Asura.Framework/Filesystem/SceneLoader.lua new file mode 100644 index 0000000..e69de29 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 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 diff --git a/Source/Asura.Framework/Math/Curve.lua b/Source/Asura.Framework/Math/Curve.lua new file mode 100644 index 0000000..e69de29 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 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ºÍ×é¼þ¡£ -- cgit v1.1-26-g67d0