From 1497dccd63a84b7ee2b229b1ad9c5c02718f2a78 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Tue, 19 Mar 2019 23:06:27 +0800
Subject: *rename

---
 samples/Hello/.asura/test.data                     |   0
 samples/Hello/editor/card_editor.lua               |  12 +++++++++
 samples/Hello/entities.folder.asset                |   4 +++
 samples/Hello/entities/anim.gameobject.asset       |   3 +++
 samples/Hello/entities/player.gameobject.asset     |  15 +++++++++++
 samples/Hello/gfx.folder.asset                     |   4 +++
 samples/Hello/gfx/icon.png                         | Bin 0 -> 4147 bytes
 samples/Hello/gfx/icon.png.image.asset             |   5 ++++
 samples/Hello/gfx/mt_thunder.material.asset        |   4 +++
 samples/Hello/gfx/test.animation.asset             |  15 +++++++++++
 samples/Hello/hello.asuraproject                   |   3 +++
 samples/Hello/loaders.folder.asset                 |   4 +++
 samples/Hello/loaders/tiledmap_loader.lua          |  13 ++++++++++
 .../Hello/loaders/tiledmap_loader.lua.script.asset |   4 +++
 samples/Hello/scripts.folder.asset                 |   4 +++
 samples/Hello/scripts/components.folder.asset      |   4 +++
 samples/Hello/scripts/components/fireball.lua      |  28 +++++++++++++++++++++
 .../scripts/components/fireball.lua.script.asset   |   4 +++
 samples/Hello/scripts/components/fly.lua           |   0
 .../Hello/scripts/components/fly.lua.script.asset  |   4 +++
 samples/Hello/scripts/components/move.lua          |   0
 .../Hello/scripts/components/move.lua.script.asset |   4 +++
 samples/Hello/scripts/entities.folder.asset        |   4 +++
 samples/Hello/scripts/entities.script.asset        |   4 +++
 samples/Hello/scripts/entities/bullet.lua          |   0
 .../Hello/scripts/entities/bullet.lua.script.asset |   4 +++
 samples/Hello/scripts/entities/spark.lua           |   3 +++
 .../Hello/scripts/entities/spark.lua.script.asset  |   4 +++
 samples/Hello/scripts/hello.lua                    |   0
 samples/Hello/scripts/hello.lua.script.asset       |   4 +++
 samples/Hello/scripts/material_loader.lua          |  16 ++++++++++++
 .../Hello/scripts/material_loader.lua.script.asset |   4 +++
 samples/Hello/scripts/tiledmap_importer.lua        |   9 +++++++
 .../scripts/tiledmap_importer.lua.script.asset     |   4 +++
 samples/Hello/sfx/a.ogg                            |   0
 samples/Hello/sfx/a.ogg.sound.asset                |   4 +++
 samples/Hello/shaders.folder.asset                 |   4 +++
 samples/Hello/shaders/sh_thunder.shader.asset      |  19 ++++++++++++++
 samples/Hello/sprite.folder.asset                  |   4 +++
 samples/Hello/sprite/spr_image.sprite.asset        |   7 ++++++
 samples/Hello/tiledmap.folder.asset                |   4 +++
 samples/Hello/tiledmap/boat.tiledmap               |   0
 samples/Hello/tiledmap/boat.tiledmap.asset.asset   |   4 +++
 .../Hello/tiledmap/boat.tiledmap2.tiledmap.asset   |   4 +++
 44 files changed, 240 insertions(+)
 create mode 100644 samples/Hello/.asura/test.data
 create mode 100644 samples/Hello/editor/card_editor.lua
 create mode 100644 samples/Hello/entities.folder.asset
 create mode 100644 samples/Hello/entities/anim.gameobject.asset
 create mode 100644 samples/Hello/entities/player.gameobject.asset
 create mode 100644 samples/Hello/gfx.folder.asset
 create mode 100644 samples/Hello/gfx/icon.png
 create mode 100644 samples/Hello/gfx/icon.png.image.asset
 create mode 100644 samples/Hello/gfx/mt_thunder.material.asset
 create mode 100644 samples/Hello/gfx/test.animation.asset
 create mode 100644 samples/Hello/hello.asuraproject
 create mode 100644 samples/Hello/loaders.folder.asset
 create mode 100644 samples/Hello/loaders/tiledmap_loader.lua
 create mode 100644 samples/Hello/loaders/tiledmap_loader.lua.script.asset
 create mode 100644 samples/Hello/scripts.folder.asset
 create mode 100644 samples/Hello/scripts/components.folder.asset
 create mode 100644 samples/Hello/scripts/components/fireball.lua
 create mode 100644 samples/Hello/scripts/components/fireball.lua.script.asset
 create mode 100644 samples/Hello/scripts/components/fly.lua
 create mode 100644 samples/Hello/scripts/components/fly.lua.script.asset
 create mode 100644 samples/Hello/scripts/components/move.lua
 create mode 100644 samples/Hello/scripts/components/move.lua.script.asset
 create mode 100644 samples/Hello/scripts/entities.folder.asset
 create mode 100644 samples/Hello/scripts/entities.script.asset
 create mode 100644 samples/Hello/scripts/entities/bullet.lua
 create mode 100644 samples/Hello/scripts/entities/bullet.lua.script.asset
 create mode 100644 samples/Hello/scripts/entities/spark.lua
 create mode 100644 samples/Hello/scripts/entities/spark.lua.script.asset
 create mode 100644 samples/Hello/scripts/hello.lua
 create mode 100644 samples/Hello/scripts/hello.lua.script.asset
 create mode 100644 samples/Hello/scripts/material_loader.lua
 create mode 100644 samples/Hello/scripts/material_loader.lua.script.asset
 create mode 100644 samples/Hello/scripts/tiledmap_importer.lua
 create mode 100644 samples/Hello/scripts/tiledmap_importer.lua.script.asset
 create mode 100644 samples/Hello/sfx/a.ogg
 create mode 100644 samples/Hello/sfx/a.ogg.sound.asset
 create mode 100644 samples/Hello/shaders.folder.asset
 create mode 100644 samples/Hello/shaders/sh_thunder.shader.asset
 create mode 100644 samples/Hello/sprite.folder.asset
 create mode 100644 samples/Hello/sprite/spr_image.sprite.asset
 create mode 100644 samples/Hello/tiledmap.folder.asset
 create mode 100644 samples/Hello/tiledmap/boat.tiledmap
 create mode 100644 samples/Hello/tiledmap/boat.tiledmap.asset.asset
 create mode 100644 samples/Hello/tiledmap/boat.tiledmap2.tiledmap.asset

(limited to 'samples/Hello')

diff --git a/samples/Hello/.asura/test.data b/samples/Hello/.asura/test.data
new file mode 100644
index 0000000..e69de29
diff --git a/samples/Hello/editor/card_editor.lua b/samples/Hello/editor/card_editor.lua
new file mode 100644
index 0000000..3527881
--- /dev/null
+++ b/samples/Hello/editor/card_editor.lua
@@ -0,0 +1,12 @@
+local CardEditor = AsuraEditor.Window.New("Card Editor", "tools/My windows/Card editor")
+
+function CardEditor.OnOpen(self)
+  self:SetSize(200, 300)
+  
+end
+
+function CardEditor.OnEvent(self, e) 
+
+end
+
+return CardEditor 
\ 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..1d8fd23
--- /dev/null
+++ b/samples/Hello/entities.folder.asset
@@ -0,0 +1,4 @@
+{
+	type="folder",
+	extern="entities"
+}
\ 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..484d982
--- /dev/null
+++ b/samples/Hello/entities/anim.gameobject.asset
@@ -0,0 +1,3 @@
+{
+	type="gameobject",
+}
\ 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..a0ef6b5
--- /dev/null
+++ b/samples/Hello/entities/player.gameobject.asset
@@ -0,0 +1,15 @@
+{
+	type="gameobject",
+	components={
+		"/scripts/components/fireball.lua",
+		"/scripts/components/fly.lua",
+		"/scripts/components/move.lua",
+	},
+	child_gameobjects={
+		["axe keeper"] = {
+			components = {
+			
+			},
+		}
+	}
+}
\ 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..2ad12da
--- /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 b/samples/Hello/gfx/icon.png
new file mode 100644
index 0000000..8074c4c
Binary files /dev/null and b/samples/Hello/gfx/icon.png differ
diff --git a/samples/Hello/gfx/icon.png.image.asset b/samples/Hello/gfx/icon.png.image.asset
new file mode 100644
index 0000000..7ab112c
--- /dev/null
+++ b/samples/Hello/gfx/icon.png.image.asset
@@ -0,0 +1,5 @@
+{
+	type="image",
+  guid=jhaklsdhjksdhfkjshdj,
+	extern="icon.png"
+}
\ 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..1b768f2
--- /dev/null
+++ b/samples/Hello/gfx/mt_thunder.material.asset
@@ -0,0 +1,4 @@
+{
+	type="material",
+	shader="/shaders/sh_thunder",
+}
\ 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..2750135
--- /dev/null
+++ b/samples/Hello/gfx/test.animation.asset
@@ -0,0 +1,15 @@
+{
+	type="animation",
+	duration=3,
+	loop=true,
+	update_sprite=true,
+	update_transform=false,
+	update_color=true,
+	key_frames=4,
+	frames={
+		{time=0.0,sprite="/sprites/hero_0.spr",color={255,0,0,255}},
+		{time=0.1,sprite="/sprites/hero_1.spr",color={255,255,0,255}},
+		{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/hello.asuraproject b/samples/Hello/hello.asuraproject
new file mode 100644
index 0000000..3d05a29
--- /dev/null
+++ b/samples/Hello/hello.asuraproject
@@ -0,0 +1,3 @@
+{
+	projectname="hello",
+}
\ 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..2024d8b
--- /dev/null
+++ b/samples/Hello/loaders.folder.asset
@@ -0,0 +1,4 @@
+{
+	type="folder",
+	extern="loaders"
+}
\ 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..8bc06d4
--- /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.script.asset b/samples/Hello/loaders/tiledmap_loader.lua.script.asset
new file mode 100644
index 0000000..c0cd9d7
--- /dev/null
+++ b/samples/Hello/loaders/tiledmap_loader.lua.script.asset
@@ -0,0 +1,4 @@
+{
+	type="script",
+	extern="tiledmap_loader.lua"
+}
\ 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..60fc695
--- /dev/null
+++ b/samples/Hello/scripts.folder.asset
@@ -0,0 +1,4 @@
+{
+	type="folder",
+	extern="scripts"
+}
\ No newline at end of file
diff --git a/samples/Hello/scripts/components.folder.asset b/samples/Hello/scripts/components.folder.asset
new file mode 100644
index 0000000..84dcfcb
--- /dev/null
+++ b/samples/Hello/scripts/components.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 b/samples/Hello/scripts/components/fireball.lua
new file mode 100644
index 0000000..8b31228
--- /dev/null
+++ b/samples/Hello/scripts/components/fireball.lua
@@ -0,0 +1,28 @@
+--从抽象类component中派生
+--lua require不会多次载入，见package.load函数
+local Spark = require("scripts/spark.lua")
+local Fireball = AsuraEngine.Component.Extend("Fireball")
+-- 组件下的非函数类型（七种）都会显示在编辑器中，要显示在编辑器中，必须给一个初始值，以
+-- 判断类型，如果是nil，代表不需要显示在编辑器中
+Fireball.name = ""
+Fireball.position = 1
+Fireball.image = nil
+Fireball.spark = Spark.New()
+
+function Fireball:OnEnable() 
+	self.image = self.gameobject.GetComponent(AsuraEngine.Image)
+end
+
+function Fireball:OnEvent(e)
+
+end
+
+function Fireball:OnUpdate(ms)
+
+end 
+
+function Fireball:OnDraw()
+
+end
+
+return Fireball
\ No newline at end of file
diff --git a/samples/Hello/scripts/components/fireball.lua.script.asset b/samples/Hello/scripts/components/fireball.lua.script.asset
new file mode 100644
index 0000000..4aa178b
--- /dev/null
+++ b/samples/Hello/scripts/components/fireball.lua.script.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.script.asset b/samples/Hello/scripts/components/fly.lua.script.asset
new file mode 100644
index 0000000..7f17b53
--- /dev/null
+++ b/samples/Hello/scripts/components/fly.lua.script.asset
@@ -0,0 +1,4 @@
+{
+    type="script",
+    extern="fly.lua"
+}
\ No newline at end of file
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.script.asset b/samples/Hello/scripts/components/move.lua.script.asset
new file mode 100644
index 0000000..d07a2c5
--- /dev/null
+++ b/samples/Hello/scripts/components/move.lua.script.asset
@@ -0,0 +1,4 @@
+{
+    type="script",
+    extern="move.lua",
+}
\ No newline at end of file
diff --git a/samples/Hello/scripts/entities.folder.asset b/samples/Hello/scripts/entities.folder.asset
new file mode 100644
index 0000000..f2ec91c
--- /dev/null
+++ b/samples/Hello/scripts/entities.folder.asset
@@ -0,0 +1,4 @@
+{
+  type="entities",
+  extern="folder"
+}
\ No newline at end of file
diff --git a/samples/Hello/scripts/entities.script.asset b/samples/Hello/scripts/entities.script.asset
new file mode 100644
index 0000000..c1bd20a
--- /dev/null
+++ b/samples/Hello/scripts/entities.script.asset
@@ -0,0 +1,4 @@
+{
+    type="script",
+    extern="entities"
+}
\ No newline at end of file
diff --git a/samples/Hello/scripts/entities/bullet.lua b/samples/Hello/scripts/entities/bullet.lua
new file mode 100644
index 0000000..e69de29
diff --git a/samples/Hello/scripts/entities/bullet.lua.script.asset b/samples/Hello/scripts/entities/bullet.lua.script.asset
new file mode 100644
index 0000000..576311c
--- /dev/null
+++ b/samples/Hello/scripts/entities/bullet.lua.script.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 b/samples/Hello/scripts/entities/spark.lua
new file mode 100644
index 0000000..c47be06
--- /dev/null
+++ b/samples/Hello/scripts/entities/spark.lua
@@ -0,0 +1,3 @@
+local spark
+
+return spark
\ No newline at end of file
diff --git a/samples/Hello/scripts/entities/spark.lua.script.asset b/samples/Hello/scripts/entities/spark.lua.script.asset
new file mode 100644
index 0000000..a105600
--- /dev/null
+++ b/samples/Hello/scripts/entities/spark.lua.script.asset
@@ -0,0 +1,4 @@
+{
+	type="script",
+	extern="spark.lua"
+}
\ No newline at end of file
diff --git a/samples/Hello/scripts/hello.lua b/samples/Hello/scripts/hello.lua
new file mode 100644
index 0000000..e69de29
diff --git a/samples/Hello/scripts/hello.lua.script.asset b/samples/Hello/scripts/hello.lua.script.asset
new file mode 100644
index 0000000..9637302
--- /dev/null
+++ b/samples/Hello/scripts/hello.lua.script.asset
@@ -0,0 +1,4 @@
+{
+	type="script",
+	extern="hello.lua"
+}
\ 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..2e9b771
--- /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.script.asset b/samples/Hello/scripts/material_loader.lua.script.asset
new file mode 100644
index 0000000..9d66f2f
--- /dev/null
+++ b/samples/Hello/scripts/material_loader.lua.script.asset
@@ -0,0 +1,4 @@
+{
+    type="script",
+    extern="material_loader.lua",
+}
\ No newline at end of file
diff --git a/samples/Hello/scripts/tiledmap_importer.lua b/samples/Hello/scripts/tiledmap_importer.lua
new file mode 100644
index 0000000..d15a089
--- /dev/null
+++ b/samples/Hello/scripts/tiledmap_importer.lua
@@ -0,0 +1,9 @@
+local TiledMapLoader = AsuraEngine.Importer.New("tiledmap") --tiledmap是tag，表明了tiledmap
+local TiledMapManager = require "TiledMapManager.lua"
+function TiledMapLoader:Load( asset, data )
+	
+  
+  
+end
+
+return TiledMapLoader
\ No newline at end of file
diff --git a/samples/Hello/scripts/tiledmap_importer.lua.script.asset b/samples/Hello/scripts/tiledmap_importer.lua.script.asset
new file mode 100644
index 0000000..3ec18f7
--- /dev/null
+++ b/samples/Hello/scripts/tiledmap_importer.lua.script.asset
@@ -0,0 +1,4 @@
+{
+    type="script",
+    extern="tiledmap_importer.lua",
+}
\ No newline at end of file
diff --git a/samples/Hello/sfx/a.ogg b/samples/Hello/sfx/a.ogg
new file mode 100644
index 0000000..e69de29
diff --git a/samples/Hello/sfx/a.ogg.sound.asset b/samples/Hello/sfx/a.ogg.sound.asset
new file mode 100644
index 0000000..bccab2f
--- /dev/null
+++ b/samples/Hello/sfx/a.ogg.sound.asset
@@ -0,0 +1,4 @@
+{
+	type="sound",
+	extern="a.ogg"
+}
\ 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..aee4b22
--- /dev/null
+++ b/samples/Hello/shaders.folder.asset
@@ -0,0 +1,4 @@
+{
+	type="folder",
+	extern="shaders"
+}
\ 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..9becdf6
--- /dev/null
+++ b/samples/Hello/shaders/sh_thunder.shader.asset
@@ -0,0 +1,19 @@
+{
+	type="shader",
+	uniforms={
+    {text="", name="", type="float", value=1}
+  }
+  vertex=[[
+void main()
+{
+	
+}
+	]],
+	fragment=[[
+void main()
+{
+	
+}
+	]]  
+}
+-- 缂栬緫杩囩▼涓紝缂栬緫鍣ㄥ氨浼氭妸shader婧愪唬鐮侀噷鐨剈niforms鎵惧嚭鏉ャ��
\ 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..357ca80
--- /dev/null
+++ b/samples/Hello/sprite.folder.asset
@@ -0,0 +1,4 @@
+{
+	type="folder",
+	extern="sprite"
+}
\ 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..0edbcd9
--- /dev/null
+++ b/samples/Hello/sprite/spr_image.sprite.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.folder.asset b/samples/Hello/tiledmap.folder.asset
new file mode 100644
index 0000000..d1c8299
--- /dev/null
+++ b/samples/Hello/tiledmap.folder.asset
@@ -0,0 +1,4 @@
+{
+	type="folder",
+	extern="tiledmap"
+}
\ 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.asset b/samples/Hello/tiledmap/boat.tiledmap.asset.asset
new file mode 100644
index 0000000..3390293
--- /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.tiledmap.asset b/samples/Hello/tiledmap/boat.tiledmap2.tiledmap.asset
new file mode 100644
index 0000000..739c895
--- /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
-- 
cgit v1.1-26-g67d0