From 90b11fbb0e4c578bf507370e102d6a5ed30ba31e Mon Sep 17 00:00:00 2001 From: chai Date: Tue, 22 Jan 2019 18:14:22 +0800 Subject: =?UTF-8?q?*=E4=BF=AE=E6=94=B9asset=E6=A0=BC=E5=BC=8F=EF=BC=8C?= =?UTF-8?q?=E5=8F=AF=E8=AF=BB=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Samples/Hello/entities.folder.asset | 6 +++-- Samples/Hello/entities/anim.gameobject.asset | 4 +++- Samples/Hello/entities/player.gameobject.asset | 26 ++++++++++---------- Samples/Hello/gfx.folder.asset | 6 +++-- Samples/Hello/gfx/icon.png.image.asset | 6 +++-- Samples/Hello/gfx/mt_thunder.material.asset | 6 +++-- Samples/Hello/gfx/test.animation.asset | 28 ++++++++++++---------- Samples/Hello/loaders.folder.asset | 6 +++-- .../Hello/loaders/tiledmap_loader.lua.script.asset | 6 +++-- Samples/Hello/scripts.folder.asset | 6 +++-- .../scripts/components/fireball.lua.script.asset | 6 +++-- .../Hello/scripts/entities/bullet.lua.script.asset | 6 +++-- .../Hello/scripts/entities/spark.lua.script.asset | 6 +++-- Samples/Hello/scripts/hello.lua.script.asset | 6 +++-- Samples/Hello/sfx/a.ogg.sound.asset | 6 +++-- Samples/Hello/shaders.folder.asset | 6 +++-- Samples/Hello/shaders/sh_thunder.shader.asset | 26 ++++++++++---------- Samples/Hello/sprite.folder.asset | 6 +++-- Samples/Hello/sprite/spr_image.sprite.asset | 12 ++++++---- Samples/Hello/tiledmap.folder.asset | 6 +++-- Samples/Hello/tiledmap/boat.tiledmap.asset.asset | 6 +++-- .../Hello/tiledmap/boat.tiledmap2.tiledmap.asset | 6 +++-- 22 files changed, 121 insertions(+), 77 deletions(-) (limited to 'Samples/Hello') diff --git a/Samples/Hello/entities.folder.asset b/Samples/Hello/entities.folder.asset index bca6159..6675084 100644 --- a/Samples/Hello/entities.folder.asset +++ b/Samples/Hello/entities.folder.asset @@ -1,2 +1,4 @@ -type="folder", -extern="./folder" +{ + type="folder", + extern="./folder" +} \ No newline at end of file diff --git a/Samples/Hello/entities/anim.gameobject.asset b/Samples/Hello/entities/anim.gameobject.asset index 518579f..484d982 100644 --- a/Samples/Hello/entities/anim.gameobject.asset +++ b/Samples/Hello/entities/anim.gameobject.asset @@ -1 +1,3 @@ -type="gameobject", \ No newline at end of file +{ + type="gameobject", +} \ No newline at end of file diff --git a/Samples/Hello/entities/player.gameobject.asset b/Samples/Hello/entities/player.gameobject.asset index 03785bc..a0ef6b5 100644 --- a/Samples/Hello/entities/player.gameobject.asset +++ b/Samples/Hello/entities/player.gameobject.asset @@ -1,13 +1,15 @@ -type="gameobject", -components={ - "/scripts/components/fireball.lua", - "/scripts/components/fly.lua", - "/scripts/components/move.lua", -}, -child_gameobjects={ - ["axe keeper"] = { - components = { - - }, +{ + 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 index 3aefe62..2ad12da 100644 --- a/Samples/Hello/gfx.folder.asset +++ b/Samples/Hello/gfx.folder.asset @@ -1,2 +1,4 @@ -type="folder", -extern="gfx" +{ + type="folder", + extern="gfx" +} \ No newline at end of file diff --git a/Samples/Hello/gfx/icon.png.image.asset b/Samples/Hello/gfx/icon.png.image.asset index e9d0125..d296c4e 100644 --- a/Samples/Hello/gfx/icon.png.image.asset +++ b/Samples/Hello/gfx/icon.png.image.asset @@ -1,2 +1,4 @@ -type="image", -extern="icon.png" +{ + type="image", + 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 index ad4ac52..1b768f2 100644 --- a/Samples/Hello/gfx/mt_thunder.material.asset +++ b/Samples/Hello/gfx/mt_thunder.material.asset @@ -1,2 +1,4 @@ -type="material", -shader="/shaders/sh_thunder", +{ + 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 index 63970a2..2750135 100644 --- a/Samples/Hello/gfx/test.animation.asset +++ b/Samples/Hello/gfx/test.animation.asset @@ -1,13 +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}}, -}, +{ + 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/loaders.folder.asset b/Samples/Hello/loaders.folder.asset index bca6159..6675084 100644 --- a/Samples/Hello/loaders.folder.asset +++ b/Samples/Hello/loaders.folder.asset @@ -1,2 +1,4 @@ -type="folder", -extern="./folder" +{ + type="folder", + extern="./folder" +} \ 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 index 873ea21..c0cd9d7 100644 --- a/Samples/Hello/loaders/tiledmap_loader.lua.script.asset +++ b/Samples/Hello/loaders/tiledmap_loader.lua.script.asset @@ -1,2 +1,4 @@ -type="script", -extern="tiledmap_loader.lua" \ No newline at end of file +{ + 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 index bca6159..6675084 100644 --- a/Samples/Hello/scripts.folder.asset +++ b/Samples/Hello/scripts.folder.asset @@ -1,2 +1,4 @@ -type="folder", -extern="./folder" +{ + type="folder", + extern="./folder" +} \ 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 index efed6cc..4aa178b 100644 --- a/Samples/Hello/scripts/components/fireball.lua.script.asset +++ b/Samples/Hello/scripts/components/fireball.lua.script.asset @@ -1,2 +1,4 @@ -type="script", -extern="fireball.lua", +{ + type="script", + extern="fireball.lua", +} \ No newline at end of file diff --git a/Samples/Hello/scripts/entities/bullet.lua.script.asset b/Samples/Hello/scripts/entities/bullet.lua.script.asset index d69ec46..576311c 100644 --- a/Samples/Hello/scripts/entities/bullet.lua.script.asset +++ b/Samples/Hello/scripts/entities/bullet.lua.script.asset @@ -1,2 +1,4 @@ -type="script", -extern="bullet.lua" +{ + type="script", + extern="bullet.lua" +} \ 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 index 7b29052..a105600 100644 --- a/Samples/Hello/scripts/entities/spark.lua.script.asset +++ b/Samples/Hello/scripts/entities/spark.lua.script.asset @@ -1,2 +1,4 @@ -type="script", -extern="spark.lua" +{ + type="script", + extern="spark.lua" +} \ No newline at end of file diff --git a/Samples/Hello/scripts/hello.lua.script.asset b/Samples/Hello/scripts/hello.lua.script.asset index 32725a5..9637302 100644 --- a/Samples/Hello/scripts/hello.lua.script.asset +++ b/Samples/Hello/scripts/hello.lua.script.asset @@ -1,2 +1,4 @@ -type="script", -extern="hello.lua" +{ + type="script", + extern="hello.lua" +} \ No newline at end of file diff --git a/Samples/Hello/sfx/a.ogg.sound.asset b/Samples/Hello/sfx/a.ogg.sound.asset index 1293847..bccab2f 100644 --- a/Samples/Hello/sfx/a.ogg.sound.asset +++ b/Samples/Hello/sfx/a.ogg.sound.asset @@ -1,2 +1,4 @@ -type="sound", -extern="a.ogg" +{ + 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 index bca6159..6675084 100644 --- a/Samples/Hello/shaders.folder.asset +++ b/Samples/Hello/shaders.folder.asset @@ -1,2 +1,4 @@ -type="folder", -extern="./folder" +{ + type="folder", + extern="./folder" +} \ No newline at end of file diff --git a/Samples/Hello/shaders/sh_thunder.shader.asset b/Samples/Hello/shaders/sh_thunder.shader.asset index 8354b3c..9e340c7 100644 --- a/Samples/Hello/shaders/sh_thunder.shader.asset +++ b/Samples/Hello/shaders/sh_thunder.shader.asset @@ -1,13 +1,15 @@ -type="shader", -vertex=[[ -void main() { - -} -]], -fragment=[[ -void main() -{ - -} -]] + type="shader", + vertex=[[ + void main() + { + + } + ]], + fragment=[[ + void main() + { + + } + ]] +} \ No newline at end of file diff --git a/Samples/Hello/sprite.folder.asset b/Samples/Hello/sprite.folder.asset index bca6159..6675084 100644 --- a/Samples/Hello/sprite.folder.asset +++ b/Samples/Hello/sprite.folder.asset @@ -1,2 +1,4 @@ -type="folder", -extern="./folder" +{ + type="folder", + extern="./folder" +} \ No newline at end of file diff --git a/Samples/Hello/sprite/spr_image.sprite.asset b/Samples/Hello/sprite/spr_image.sprite.asset index 95eefea..0edbcd9 100644 --- a/Samples/Hello/sprite/spr_image.sprite.asset +++ b/Samples/Hello/sprite/spr_image.sprite.asset @@ -1,5 +1,7 @@ -type="sprite", -image="/gfx/icon.png", -size={12,32}, -anchor={10,10}, -quad={0,0,10,10} +{ + 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 index bca6159..6675084 100644 --- a/Samples/Hello/tiledmap.folder.asset +++ b/Samples/Hello/tiledmap.folder.asset @@ -1,2 +1,4 @@ -type="folder", -extern="./folder" +{ + type="folder", + extern="./folder" +} \ No newline at end of file diff --git a/Samples/Hello/tiledmap/boat.tiledmap.asset.asset b/Samples/Hello/tiledmap/boat.tiledmap.asset.asset index 957fb9a..3390293 100644 --- a/Samples/Hello/tiledmap/boat.tiledmap.asset.asset +++ b/Samples/Hello/tiledmap/boat.tiledmap.asset.asset @@ -1,2 +1,4 @@ -type="asset", --默认的asset -extern="boat.tiledmap" +{ + 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 index 5f0f2be..739c895 100644 --- a/Samples/Hello/tiledmap/boat.tiledmap2.tiledmap.asset +++ b/Samples/Hello/tiledmap/boat.tiledmap2.tiledmap.asset @@ -1,2 +1,4 @@ -type="tiledmap", --根据type找到loader，把此asset和extern内容传入 -extern="boat.tiledmap" +{ + type="tiledmap", --根据type找到loader，把此asset和extern内容传入 + extern="boat.tiledmap" +} \ No newline at end of file -- cgit v1.1-26-g67d0