*资源格式修改

33 files changed, 39 insertions, 37 deletions

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 @@
   <ItemGroup>
     <None Include="..\..\Source\Asura.Editor\Scripts\main.lua" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Asura.Engine\Asura.Engine.vcxproj">
+      <Project>{c402199a-49c2-4568-ae79-b56cb3b510d3}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\Asura.Framework\Asura.Framework.vcxproj">
+      <Project>{a4a226cc-37db-4eb7-bd6f-b344b7b6d53b}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Source\Asura.Editor\Source\main.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\Source\Asura.Editor\Source\Widget.h" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
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 @@
       <Filter>Scripts</Filter>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Source\Asura.Editor\Source\main.cpp">
+      <Filter>Source</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\Source\Asura.Editor\Source\Widget.h">
+      <Filter>Source</Filter>
+    </ClInclude>
+  </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 a0da8ad..fab8842 100644
--- a/Build/Asura.Framework/Asura.Framework.vcxproj
+++ b/Build/Asura.Framework/Asura.Framework.vcxproj
@@ -142,7 +142,6 @@
     <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" />
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 @@
     <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>
diff --git a/Samples/Hello/entities.asset b/Samples/Hello/entities.folder.asset
index 18677b5..18677b5 100644
--- a/Samples/Hello/entities.asset
+++ b/Samples/Hello/entities.folder.asset
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.gameobject.asset
index 5c1a82d..c57d3a0 100644
--- a/Samples/Hello/entities/player.asset
+++ b/Samples/Hello/entities/player.gameobject.asset
@@ -1,4 +1,3 @@
-{
 type="gameobject",
 components={
     "/scripts/components/fireball.lua",
@@ -8,4 +7,3 @@ components={
 child_gameobjects={
     
 }
-}
\ No newline at end of file
diff --git a/Samples/Hello/gfx.asset b/Samples/Hello/gfx.folder.asset
index c94c496..c94c496 100644
--- a/Samples/Hello/gfx.asset
+++ b/Samples/Hello/gfx.folder.asset
diff --git a/Samples/Hello/gfx/icon.png.asset b/Samples/Hello/gfx/icon.png.image.asset
index 83a5b60..e9d0125 100644
--- a/Samples/Hello/gfx/icon.png.asset
+++ b/Samples/Hello/gfx/icon.png.image.asset
@@ -1,4 +1,2 @@
-{
 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.material.asset
index 05a051a..ad4ac52 100644
--- a/Samples/Hello/gfx/mt_thunder.asset
+++ b/Samples/Hello/gfx/mt_thunder.material.asset
@@ -1,4 +1,2 @@
-{
 type="material",
 shader="/shaders/sh_thunder",
-}
\ No newline at end of file
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.folder.asset
index 18677b5..18677b5 100644
--- a/Samples/Hello/loaders.asset
+++ b/Samples/Hello/loaders.folder.asset
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.folder.asset
index 18677b5..18677b5 100644
--- a/Samples/Hello/scripts.asset
+++ b/Samples/Hello/scripts.folder.asset
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.sound.asset
index 18217d9..1293847 100644
--- a/Samples/Hello/sfx/a.ogg.asset
+++ b/Samples/Hello/sfx/a.ogg.sound.asset
@@ -1,4 +1,2 @@
-{
 type="sound",
 extern="a.ogg"
-}
\ No newline at end of file
diff --git a/Samples/Hello/shaders.asset b/Samples/Hello/shaders.folder.asset
index 18677b5..18677b5 100644
--- a/Samples/Hello/shaders.asset
+++ b/Samples/Hello/shaders.folder.asset
diff --git a/Samples/Hello/shaders/sh_thunder.asset b/Samples/Hello/shaders/sh_thunder.shader.asset
index 86cb35a..8354b3c 100644
--- a/Samples/Hello/shaders/sh_thunder.asset
+++ b/Samples/Hello/shaders/sh_thunder.shader.asset
@@ -1,4 +1,3 @@
-{
 type="shader",
 vertex=[[
 void main()
@@ -12,4 +11,3 @@ void main()
     
 }
 ]]    
-}
\ No newline at end of file
diff --git a/Samples/Hello/sprite.asset b/Samples/Hello/sprite.folder.asset
index 18677b5..18677b5 100644
--- a/Samples/Hello/sprite.asset
+++ b/Samples/Hello/sprite.folder.asset
diff --git a/Samples/Hello/sprite/spr_image.asset b/Samples/Hello/sprite/spr_image.sprite.asset
index 7b29e05..95eefea 100644
--- a/Samples/Hello/sprite/spr_image.asset
+++ b/Samples/Hello/sprite/spr_image.sprite.asset
@@ -1,7 +1,5 @@
-{
 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.asset b/Samples/Hello/tiledmap.folder.asset
index 18677b5..18677b5 100644
--- a/Samples/Hello/tiledmap.asset
+++ b/Samples/Hello/tiledmap.folder.asset
diff --git a/Samples/Hello/tiledmap/boat.tiledmap.asset b/Samples/Hello/tiledmap/boat.tiledmap.asset.asset
index b1feb62..b1feb62 100644
--- a/Samples/Hello/tiledmap/boat.tiledmap.asset
+++ b/Samples/Hello/tiledmap/boat.tiledmap.asset.asset
diff --git a/Samples/Hello/tiledmap/boat.tiledmap2.asset b/Samples/Hello/tiledmap/boat.tiledmap2.tiledmap.asset
index e502ccd..e502ccd 100644
--- a/Samples/Hello/tiledmap/boat.tiledmap2.asset
+++ b/Samples/Hello/tiledmap/boat.tiledmap2.tiledmap.asset
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/Samples/Hello/loaders/tiledmap_loader.lua.asset b/Source/Asura.Editor/Source/main.cpp
index e69de29..e69de29 100644
--- a/Samples/Hello/loaders/tiledmap_loader.lua.asset
+++ b/Source/Asura.Editor/Source/main.cpp
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
--- a/Source/Asura.Framework/Graphics/ParticleSystemManager.lua
+++ /dev/null