From 2730b6cf01d49e044b68fa889b57f5b01057471f Mon Sep 17 00:00:00 2001 From: chai Date: Tue, 22 Jan 2019 16:09:28 +0800 Subject: =?UTF-8?q?*=E8=B5=84=E6=BA=90=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Build/Asura.Editor/Asura.Editor.vcxproj | 14 ++++++++++++++ Build/Asura.Editor/Asura.Editor.vcxproj.filters | 10 ++++++++++ Build/Asura.Framework/Asura.Framework.vcxproj | 1 - Build/Asura.Framework/Asura.Framework.vcxproj.filters | 3 --- Samples/Hello/entities.asset | 4 ---- Samples/Hello/entities.folder.asset | 4 ++++ Samples/Hello/entities/anim.asset | 4 ---- Samples/Hello/entities/anim.gameobject.asset | 1 + Samples/Hello/entities/player.asset | 11 ----------- Samples/Hello/entities/player.gameobject.asset | 9 +++++++++ Samples/Hello/gfx.asset | 4 ---- Samples/Hello/gfx.folder.asset | 4 ++++ Samples/Hello/gfx/icon.png.asset | 4 ---- Samples/Hello/gfx/icon.png.image.asset | 2 ++ Samples/Hello/gfx/mt_thunder.asset | 4 ---- Samples/Hello/gfx/mt_thunder.material.asset | 2 ++ Samples/Hello/gfx/particles.asset | 4 ---- Samples/Hello/gfx/particles/fire.asset | 4 ---- Samples/Hello/gfx/test.animation.asset | 2 -- Samples/Hello/loaders.asset | 4 ---- Samples/Hello/loaders.folder.asset | 4 ++++ Samples/Hello/loaders/tiledmap_loader.lua.asset | 0 Samples/Hello/loaders/tiledmap_loader.lua.script.asset | 2 ++ Samples/Hello/scripts.asset | 4 ---- Samples/Hello/scripts.folder.asset | 4 ++++ Samples/Hello/scripts/components/fireball.lua.asset | 2 -- Samples/Hello/scripts/entities/bullet.lua.asset | 2 -- Samples/Hello/scripts/entities/spark.lua.asset | 2 -- Samples/Hello/sfx/a.ogg.asset | 4 ---- Samples/Hello/sfx/a.ogg.sound.asset | 2 ++ Samples/Hello/shaders.asset | 4 ---- Samples/Hello/shaders.folder.asset | 4 ++++ Samples/Hello/shaders/sh_thunder.asset | 15 --------------- Samples/Hello/shaders/sh_thunder.shader.asset | 13 +++++++++++++ Samples/Hello/sprite.asset | 4 ---- Samples/Hello/sprite.folder.asset | 4 ++++ Samples/Hello/sprite/spr_image.asset | 7 ------- Samples/Hello/sprite/spr_image.sprite.asset | 5 +++++ Samples/Hello/tiledmap.asset | 4 ---- Samples/Hello/tiledmap.folder.asset | 4 ++++ Samples/Hello/tiledmap/boat.tiledmap.asset | 4 ---- Samples/Hello/tiledmap/boat.tiledmap.asset.asset | 4 ++++ Samples/Hello/tiledmap/boat.tiledmap2.asset | 4 ---- Samples/Hello/tiledmap/boat.tiledmap2.tiledmap.asset | 4 ++++ Source/Asura.Editor/Scripts/main.lua | 2 ++ Source/Asura.Editor/Source/Widget.h | 9 +++++++++ Source/Asura.Editor/Source/main.cpp | 0 Source/Asura.Framework/Graphics/ParticleSystem.lua | 2 +- Source/Asura.Framework/Graphics/ParticleSystemManager.lua | 0 49 files changed, 108 insertions(+), 106 deletions(-) delete mode 100644 Samples/Hello/entities.asset create mode 100644 Samples/Hello/entities.folder.asset delete mode 100644 Samples/Hello/entities/anim.asset create mode 100644 Samples/Hello/entities/anim.gameobject.asset delete mode 100644 Samples/Hello/entities/player.asset create mode 100644 Samples/Hello/entities/player.gameobject.asset delete mode 100644 Samples/Hello/gfx.asset create mode 100644 Samples/Hello/gfx.folder.asset delete mode 100644 Samples/Hello/gfx/icon.png.asset create mode 100644 Samples/Hello/gfx/icon.png.image.asset delete mode 100644 Samples/Hello/gfx/mt_thunder.asset create mode 100644 Samples/Hello/gfx/mt_thunder.material.asset delete mode 100644 Samples/Hello/gfx/particles.asset delete mode 100644 Samples/Hello/gfx/particles/fire.asset delete mode 100644 Samples/Hello/loaders.asset create mode 100644 Samples/Hello/loaders.folder.asset delete mode 100644 Samples/Hello/loaders/tiledmap_loader.lua.asset create mode 100644 Samples/Hello/loaders/tiledmap_loader.lua.script.asset delete mode 100644 Samples/Hello/scripts.asset create mode 100644 Samples/Hello/scripts.folder.asset delete mode 100644 Samples/Hello/sfx/a.ogg.asset create mode 100644 Samples/Hello/sfx/a.ogg.sound.asset delete mode 100644 Samples/Hello/shaders.asset create mode 100644 Samples/Hello/shaders.folder.asset delete mode 100644 Samples/Hello/shaders/sh_thunder.asset create mode 100644 Samples/Hello/shaders/sh_thunder.shader.asset delete mode 100644 Samples/Hello/sprite.asset create mode 100644 Samples/Hello/sprite.folder.asset delete mode 100644 Samples/Hello/sprite/spr_image.asset create mode 100644 Samples/Hello/sprite/spr_image.sprite.asset delete mode 100644 Samples/Hello/tiledmap.asset create mode 100644 Samples/Hello/tiledmap.folder.asset delete mode 100644 Samples/Hello/tiledmap/boat.tiledmap.asset create mode 100644 Samples/Hello/tiledmap/boat.tiledmap.asset.asset delete mode 100644 Samples/Hello/tiledmap/boat.tiledmap2.asset create mode 100644 Samples/Hello/tiledmap/boat.tiledmap2.tiledmap.asset create mode 100644 Source/Asura.Editor/Source/Widget.h create mode 100644 Source/Asura.Editor/Source/main.cpp delete mode 100644 Source/Asura.Framework/Graphics/ParticleSystemManager.lua diff --git a/Build/Asura.Editor/Asura.Editor.vcxproj b/Build/Asura.Editor/Asura.Editor.vcxproj index 7549f5b..f94dc6d 100644 --- a/Build/Asura.Editor/Asura.Editor.vcxproj +++ b/Build/Asura.Editor/Asura.Editor.vcxproj @@ -122,6 +122,20 @@ + + + {c402199a-49c2-4568-ae79-b56cb3b510d3} + + + {a4a226cc-37db-4eb7-bd6f-b344b7b6d53b} + + + + + + + + diff --git a/Build/Asura.Editor/Asura.Editor.vcxproj.filters b/Build/Asura.Editor/Asura.Editor.vcxproj.filters index 16a2274..06cdee9 100644 --- a/Build/Asura.Editor/Asura.Editor.vcxproj.filters +++ b/Build/Asura.Editor/Asura.Editor.vcxproj.filters @@ -16,4 +16,14 @@ Scripts + + + Source + + + + + Source + + \ No newline at end of file diff --git a/Build/Asura.Framework/Asura.Framework.vcxproj b/Build/Asura.Framework/Asura.Framework.vcxproj index a0da8ad..fab8842 100644 --- a/Build/Asura.Framework/Asura.Framework.vcxproj +++ b/Build/Asura.Framework/Asura.Framework.vcxproj @@ -142,7 +142,6 @@ - diff --git a/Build/Asura.Framework/Asura.Framework.vcxproj.filters b/Build/Asura.Framework/Asura.Framework.vcxproj.filters index 7d312e4..9ca952b 100644 --- a/Build/Asura.Framework/Asura.Framework.vcxproj.filters +++ b/Build/Asura.Framework/Asura.Framework.vcxproj.filters @@ -105,9 +105,6 @@ Filesystem - - Graphics - GUI diff --git a/Samples/Hello/entities.asset b/Samples/Hello/entities.asset deleted file mode 100644 index 18677b5..0000000 --- a/Samples/Hello/entities.asset +++ /dev/null @@ -1,4 +0,0 @@ -{ -type="folder", -extern="./folder" -} \ No newline at end of file diff --git a/Samples/Hello/entities.folder.asset b/Samples/Hello/entities.folder.asset new file mode 100644 index 0000000..18677b5 --- /dev/null +++ b/Samples/Hello/entities.folder.asset @@ -0,0 +1,4 @@ +{ +type="folder", +extern="./folder" +} \ No newline at end of file diff --git a/Samples/Hello/entities/anim.asset b/Samples/Hello/entities/anim.asset deleted file mode 100644 index 312aeb5..0000000 --- a/Samples/Hello/entities/anim.asset +++ /dev/null @@ -1,4 +0,0 @@ -{ -type="gameobject", - -} \ No newline at end of file diff --git a/Samples/Hello/entities/anim.gameobject.asset b/Samples/Hello/entities/anim.gameobject.asset new file mode 100644 index 0000000..518579f --- /dev/null +++ b/Samples/Hello/entities/anim.gameobject.asset @@ -0,0 +1 @@ +type="gameobject", \ No newline at end of file diff --git a/Samples/Hello/entities/player.asset b/Samples/Hello/entities/player.asset deleted file mode 100644 index 5c1a82d..0000000 --- a/Samples/Hello/entities/player.asset +++ /dev/null @@ -1,11 +0,0 @@ -{ -type="gameobject", -components={ - "/scripts/components/fireball.lua", - "/scripts/components/fly.lua", - "/scripts/components/move.lua", -}, -child_gameobjects={ - -} -} \ No newline at end of file diff --git a/Samples/Hello/entities/player.gameobject.asset b/Samples/Hello/entities/player.gameobject.asset new file mode 100644 index 0000000..c57d3a0 --- /dev/null +++ b/Samples/Hello/entities/player.gameobject.asset @@ -0,0 +1,9 @@ +type="gameobject", +components={ + "/scripts/components/fireball.lua", + "/scripts/components/fly.lua", + "/scripts/components/move.lua", +}, +child_gameobjects={ + +} diff --git a/Samples/Hello/gfx.asset b/Samples/Hello/gfx.asset deleted file mode 100644 index c94c496..0000000 --- a/Samples/Hello/gfx.asset +++ /dev/null @@ -1,4 +0,0 @@ -{ -type="folder", -extern="gfx" -} \ No newline at end of file diff --git a/Samples/Hello/gfx.folder.asset b/Samples/Hello/gfx.folder.asset new file mode 100644 index 0000000..c94c496 --- /dev/null +++ b/Samples/Hello/gfx.folder.asset @@ -0,0 +1,4 @@ +{ +type="folder", +extern="gfx" +} \ No newline at end of file diff --git a/Samples/Hello/gfx/icon.png.asset b/Samples/Hello/gfx/icon.png.asset deleted file mode 100644 index 83a5b60..0000000 --- a/Samples/Hello/gfx/icon.png.asset +++ /dev/null @@ -1,4 +0,0 @@ -{ -type="image", -extern="icon.png" -} \ No newline at end of file diff --git a/Samples/Hello/gfx/icon.png.image.asset b/Samples/Hello/gfx/icon.png.image.asset new file mode 100644 index 0000000..e9d0125 --- /dev/null +++ b/Samples/Hello/gfx/icon.png.image.asset @@ -0,0 +1,2 @@ +type="image", +extern="icon.png" diff --git a/Samples/Hello/gfx/mt_thunder.asset b/Samples/Hello/gfx/mt_thunder.asset deleted file mode 100644 index 05a051a..0000000 --- a/Samples/Hello/gfx/mt_thunder.asset +++ /dev/null @@ -1,4 +0,0 @@ -{ -type="material", -shader="/shaders/sh_thunder", -} \ No newline at end of file diff --git a/Samples/Hello/gfx/mt_thunder.material.asset b/Samples/Hello/gfx/mt_thunder.material.asset new file mode 100644 index 0000000..ad4ac52 --- /dev/null +++ b/Samples/Hello/gfx/mt_thunder.material.asset @@ -0,0 +1,2 @@ +type="material", +shader="/shaders/sh_thunder", diff --git a/Samples/Hello/gfx/particles.asset b/Samples/Hello/gfx/particles.asset deleted file mode 100644 index 90e9a40..0000000 --- a/Samples/Hello/gfx/particles.asset +++ /dev/null @@ -1,4 +0,0 @@ -{ -type="particleeffecs", - -} \ No newline at end of file diff --git a/Samples/Hello/gfx/particles/fire.asset b/Samples/Hello/gfx/particles/fire.asset deleted file mode 100644 index d20e4ad..0000000 --- a/Samples/Hello/gfx/particles/fire.asset +++ /dev/null @@ -1,4 +0,0 @@ -{ -type="particlesystem", - -} \ No newline at end of file diff --git a/Samples/Hello/gfx/test.animation.asset b/Samples/Hello/gfx/test.animation.asset index e429d4c..63970a2 100644 --- a/Samples/Hello/gfx/test.animation.asset +++ b/Samples/Hello/gfx/test.animation.asset @@ -1,4 +1,3 @@ -{ type="animation", duration=3, loop=true, @@ -12,4 +11,3 @@ frames={ {time=0.2,sprite="/sprites/hero_2.spr",color={255,0,255,255}}, {time=1.0,sprite="/sprites/hero_3.spr",color={255,0,0,255}}, }, -} \ No newline at end of file diff --git a/Samples/Hello/loaders.asset b/Samples/Hello/loaders.asset deleted file mode 100644 index 18677b5..0000000 --- a/Samples/Hello/loaders.asset +++ /dev/null @@ -1,4 +0,0 @@ -{ -type="folder", -extern="./folder" -} \ No newline at end of file diff --git a/Samples/Hello/loaders.folder.asset b/Samples/Hello/loaders.folder.asset new file mode 100644 index 0000000..18677b5 --- /dev/null +++ b/Samples/Hello/loaders.folder.asset @@ -0,0 +1,4 @@ +{ +type="folder", +extern="./folder" +} \ No newline at end of file diff --git a/Samples/Hello/loaders/tiledmap_loader.lua.asset b/Samples/Hello/loaders/tiledmap_loader.lua.asset deleted file mode 100644 index e69de29..0000000 diff --git a/Samples/Hello/loaders/tiledmap_loader.lua.script.asset b/Samples/Hello/loaders/tiledmap_loader.lua.script.asset new file mode 100644 index 0000000..873ea21 --- /dev/null +++ b/Samples/Hello/loaders/tiledmap_loader.lua.script.asset @@ -0,0 +1,2 @@ +type="script", +extern="tiledmap_loader.lua" \ No newline at end of file diff --git a/Samples/Hello/scripts.asset b/Samples/Hello/scripts.asset deleted file mode 100644 index 18677b5..0000000 --- a/Samples/Hello/scripts.asset +++ /dev/null @@ -1,4 +0,0 @@ -{ -type="folder", -extern="./folder" -} \ No newline at end of file diff --git a/Samples/Hello/scripts.folder.asset b/Samples/Hello/scripts.folder.asset new file mode 100644 index 0000000..18677b5 --- /dev/null +++ b/Samples/Hello/scripts.folder.asset @@ -0,0 +1,4 @@ +{ +type="folder", +extern="./folder" +} \ No newline at end of file diff --git a/Samples/Hello/scripts/components/fireball.lua.asset b/Samples/Hello/scripts/components/fireball.lua.asset index 7789dfe..efed6cc 100644 --- a/Samples/Hello/scripts/components/fireball.lua.asset +++ b/Samples/Hello/scripts/components/fireball.lua.asset @@ -1,4 +1,2 @@ -{ type="script", extern="fireball.lua", -} \ No newline at end of file diff --git a/Samples/Hello/scripts/entities/bullet.lua.asset b/Samples/Hello/scripts/entities/bullet.lua.asset index adf32e0..d69ec46 100644 --- a/Samples/Hello/scripts/entities/bullet.lua.asset +++ b/Samples/Hello/scripts/entities/bullet.lua.asset @@ -1,4 +1,2 @@ -{ 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 index abeee56..7b29052 100644 --- a/Samples/Hello/scripts/entities/spark.lua.asset +++ b/Samples/Hello/scripts/entities/spark.lua.asset @@ -1,4 +1,2 @@ -{ type="script", extern="spark.lua" -} \ No newline at end of file diff --git a/Samples/Hello/sfx/a.ogg.asset b/Samples/Hello/sfx/a.ogg.asset deleted file mode 100644 index 18217d9..0000000 --- a/Samples/Hello/sfx/a.ogg.asset +++ /dev/null @@ -1,4 +0,0 @@ -{ -type="sound", -extern="a.ogg" -} \ No newline at end of file diff --git a/Samples/Hello/sfx/a.ogg.sound.asset b/Samples/Hello/sfx/a.ogg.sound.asset new file mode 100644 index 0000000..1293847 --- /dev/null +++ b/Samples/Hello/sfx/a.ogg.sound.asset @@ -0,0 +1,2 @@ +type="sound", +extern="a.ogg" diff --git a/Samples/Hello/shaders.asset b/Samples/Hello/shaders.asset deleted file mode 100644 index 18677b5..0000000 --- a/Samples/Hello/shaders.asset +++ /dev/null @@ -1,4 +0,0 @@ -{ -type="folder", -extern="./folder" -} \ No newline at end of file diff --git a/Samples/Hello/shaders.folder.asset b/Samples/Hello/shaders.folder.asset new file mode 100644 index 0000000..18677b5 --- /dev/null +++ b/Samples/Hello/shaders.folder.asset @@ -0,0 +1,4 @@ +{ +type="folder", +extern="./folder" +} \ No newline at end of file diff --git a/Samples/Hello/shaders/sh_thunder.asset b/Samples/Hello/shaders/sh_thunder.asset deleted file mode 100644 index 86cb35a..0000000 --- a/Samples/Hello/shaders/sh_thunder.asset +++ /dev/null @@ -1,15 +0,0 @@ -{ -type="shader", -vertex=[[ -void main() -{ - -} -]], -fragment=[[ -void main() -{ - -} -]] -} \ No newline at end of file diff --git a/Samples/Hello/shaders/sh_thunder.shader.asset b/Samples/Hello/shaders/sh_thunder.shader.asset new file mode 100644 index 0000000..8354b3c --- /dev/null +++ b/Samples/Hello/shaders/sh_thunder.shader.asset @@ -0,0 +1,13 @@ +type="shader", +vertex=[[ +void main() +{ + +} +]], +fragment=[[ +void main() +{ + +} +]] diff --git a/Samples/Hello/sprite.asset b/Samples/Hello/sprite.asset deleted file mode 100644 index 18677b5..0000000 --- a/Samples/Hello/sprite.asset +++ /dev/null @@ -1,4 +0,0 @@ -{ -type="folder", -extern="./folder" -} \ No newline at end of file diff --git a/Samples/Hello/sprite.folder.asset b/Samples/Hello/sprite.folder.asset new file mode 100644 index 0000000..18677b5 --- /dev/null +++ b/Samples/Hello/sprite.folder.asset @@ -0,0 +1,4 @@ +{ +type="folder", +extern="./folder" +} \ No newline at end of file diff --git a/Samples/Hello/sprite/spr_image.asset b/Samples/Hello/sprite/spr_image.asset deleted file mode 100644 index 7b29e05..0000000 --- a/Samples/Hello/sprite/spr_image.asset +++ /dev/null @@ -1,7 +0,0 @@ -{ -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/sprite/spr_image.sprite.asset b/Samples/Hello/sprite/spr_image.sprite.asset new file mode 100644 index 0000000..95eefea --- /dev/null +++ b/Samples/Hello/sprite/spr_image.sprite.asset @@ -0,0 +1,5 @@ +type="sprite", +image="/gfx/icon.png", +size={12,32}, +anchor={10,10}, +quad={0,0,10,10} diff --git a/Samples/Hello/tiledmap.asset b/Samples/Hello/tiledmap.asset deleted file mode 100644 index 18677b5..0000000 --- a/Samples/Hello/tiledmap.asset +++ /dev/null @@ -1,4 +0,0 @@ -{ -type="folder", -extern="./folder" -} \ No newline at end of file diff --git a/Samples/Hello/tiledmap.folder.asset b/Samples/Hello/tiledmap.folder.asset new file mode 100644 index 0000000..18677b5 --- /dev/null +++ b/Samples/Hello/tiledmap.folder.asset @@ -0,0 +1,4 @@ +{ +type="folder", +extern="./folder" +} \ No newline at end of file diff --git a/Samples/Hello/tiledmap/boat.tiledmap.asset b/Samples/Hello/tiledmap/boat.tiledmap.asset deleted file mode 100644 index b1feb62..0000000 --- a/Samples/Hello/tiledmap/boat.tiledmap.asset +++ /dev/null @@ -1,4 +0,0 @@ -{ -type="asset", --默认的asset -extern="boat.tiledmap" -} \ No newline at end of file diff --git a/Samples/Hello/tiledmap/boat.tiledmap.asset.asset b/Samples/Hello/tiledmap/boat.tiledmap.asset.asset new file mode 100644 index 0000000..b1feb62 --- /dev/null +++ b/Samples/Hello/tiledmap/boat.tiledmap.asset.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 deleted file mode 100644 index e502ccd..0000000 --- a/Samples/Hello/tiledmap/boat.tiledmap2.asset +++ /dev/null @@ -1,4 +0,0 @@ -{ -type="tiledmap", --根据type找到loader，把此asset和extern内容传入 -extern="boat.tiledmap" -} \ No newline at end of file diff --git a/Samples/Hello/tiledmap/boat.tiledmap2.tiledmap.asset b/Samples/Hello/tiledmap/boat.tiledmap2.tiledmap.asset new file mode 100644 index 0000000..e502ccd --- /dev/null +++ b/Samples/Hello/tiledmap/boat.tiledmap2.tiledmap.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.Editor/Scripts/main.lua b/Source/Asura.Editor/Scripts/main.lua index 045e6c3..1ab7dd5 100644 --- a/Source/Asura.Editor/Scripts/main.lua +++ b/Source/Asura.Editor/Scripts/main.lua @@ -1,3 +1,5 @@ local Editor = require("Asura.Editor") +--编辑器入口 + diff --git a/Source/Asura.Editor/Source/Widget.h b/Source/Asura.Editor/Source/Widget.h new file mode 100644 index 0000000..286fe91 --- /dev/null +++ b/Source/Asura.Editor/Source/Widget.h @@ -0,0 +1,9 @@ +#ifndef __ASURA_EDITOR_WIDGET_H__ +#define __ASURA_EDITOR_WIDGET_H__ + +namespace AusraEditor +{ + +} + +#endif \ No newline at end of file diff --git a/Source/Asura.Editor/Source/main.cpp b/Source/Asura.Editor/Source/main.cpp new file mode 100644 index 0000000..e69de29 diff --git a/Source/Asura.Framework/Graphics/ParticleSystem.lua b/Source/Asura.Framework/Graphics/ParticleSystem.lua index 466d622..21c35b8 100644 --- a/Source/Asura.Framework/Graphics/ParticleSystem.lua +++ b/Source/Asura.Framework/Graphics/ParticleSystem.lua @@ -1,3 +1,3 @@ ---粒子系统 +--粒子系统，是一个组件 local ParticleSystem diff --git a/Source/Asura.Framework/Graphics/ParticleSystemManager.lua b/Source/Asura.Framework/Graphics/ParticleSystemManager.lua deleted file mode 100644 index e69de29..0000000 -- cgit v1.1-26-g67d0