summaryrefslogtreecommitdiff
path: root/Samples/Hello
diff options
context:
space:
mode:
Diffstat (limited to 'Samples/Hello')
-rw-r--r--Samples/Hello/entities/anim.asset4
-rw-r--r--Samples/Hello/entities/player.asr5
-rw-r--r--Samples/Hello/entities/player.asset8
-rw-r--r--Samples/Hello/gfx/icon.png.asr4
-rw-r--r--Samples/Hello/gfx/icon.png.asset4
-rw-r--r--Samples/Hello/gfx/mt_thunder.asset4
-rw-r--r--Samples/Hello/gfx/mt_thunder.axm3
-rw-r--r--Samples/Hello/gfx/particles/fire.asr4
-rw-r--r--Samples/Hello/gfx/particles/fire.asset4
-rw-r--r--Samples/Hello/gfx/test.animation.asset14
-rw-r--r--Samples/Hello/hello.asuraproject5
-rw-r--r--Samples/Hello/loaders/tiledmap_loader.lua13
-rw-r--r--Samples/Hello/loaders/tiledmap_loader.lua.asset (renamed from Samples/Hello/scripts/components/fireball.lua.asr)0
-rw-r--r--Samples/Hello/scripts/components/fireball.lua.asset4
-rw-r--r--Samples/Hello/scripts/components/fly.lua (renamed from Samples/Hello/scripts/entities/spark.lua.asr)0
-rw-r--r--Samples/Hello/scripts/components/fly.lua.asset (renamed from Samples/Hello/scripts/tiledmapimporter.lua.axm)0
-rw-r--r--Samples/Hello/scripts/components/move.lua0
-rw-r--r--Samples/Hello/scripts/components/move.lua.asset0
-rw-r--r--Samples/Hello/scripts/entities/bullet.lua.asr3
-rw-r--r--Samples/Hello/scripts/entities/bullet.lua.asset4
-rw-r--r--Samples/Hello/scripts/entities/spark.lua.asset4
-rw-r--r--Samples/Hello/scripts/hello.lua.asset4
-rw-r--r--Samples/Hello/scripts/hello.lua.axm3
-rw-r--r--Samples/Hello/scripts/material_loader.lua16
-rw-r--r--Samples/Hello/scripts/material_loader.lua.asset0
-rw-r--r--Samples/Hello/scripts/tiledmapimporter.lua8
-rw-r--r--Samples/Hello/scripts/tiledmapimporter.lua.asset0
-rw-r--r--Samples/Hello/shaders/sh_thunder.asset15
-rw-r--r--Samples/Hello/shaders/sh_thunder.axm4
-rw-r--r--Samples/Hello/spr/spr_image.asr6
-rw-r--r--Samples/Hello/sprite/spr_image.asset7
-rw-r--r--Samples/Hello/tiledmap/boat.tiledmap0
-rw-r--r--Samples/Hello/tiledmap/boat.tiledmap.asset4
-rw-r--r--Samples/Hello/tiledmap/boat.tiledmap2.asset4
34 files changed, 121 insertions, 37 deletions
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 @@
-<gameobject>
- <components>
- <component></component>
- </components>
-</gameobject> \ 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 @@
-<image>
- <extern>icon.png</extern>
- <size>1</size>
-</image> \ 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 @@
-<material>
- <shader>/shaders/sh_thunder</shader>
-</material> \ 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 @@
-<!--ϵͳ-->
-<particlesystem>
-
-</particlesystem> \ 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 @@
-<folders>
-</folders> \ 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/scripts/components/fireball.lua.asr b/Samples/Hello/loaders/tiledmap_loader.lua.asset
index e69de29..e69de29 100644
--- a/Samples/Hello/scripts/components/fireball.lua.asr
+++ b/Samples/Hello/loaders/tiledmap_loader.lua.asset
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/entities/spark.lua.asr b/Samples/Hello/scripts/components/fly.lua
index e69de29..e69de29 100644
--- a/Samples/Hello/scripts/entities/spark.lua.asr
+++ b/Samples/Hello/scripts/components/fly.lua
diff --git a/Samples/Hello/scripts/tiledmapimporter.lua.axm b/Samples/Hello/scripts/components/fly.lua.asset
index e69de29..e69de29 100644
--- a/Samples/Hello/scripts/tiledmapimporter.lua.axm
+++ b/Samples/Hello/scripts/components/fly.lua.asset
diff --git a/Samples/Hello/scripts/components/move.lua b/Samples/Hello/scripts/components/move.lua
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Samples/Hello/scripts/components/move.lua
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
--- /dev/null
+++ b/Samples/Hello/scripts/components/move.lua.asset
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 @@
-<script>
- <extern>bullet.lua</extern>
-</script> \ 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.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 @@
-<script>
- <extern>hello.lua</extern>
-</script> \ 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
--- /dev/null
+++ b/Samples/Hello/scripts/material_loader.lua.asset
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") --tiledmaptagtiledmap
+local TiledMapLoader = AsuraEngine.Importer.New("tiledmap") --tiledmaptagtiledmap
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
--- /dev/null
+++ b/Samples/Hello/scripts/tiledmapimporter.lua.asset
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 @@
-<shader>
- <vertex>default.vert</vertex>
- <fragment>thunder.frag</fragment>
-</shader> \ 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 @@
-<sprite>
- <image>gfx/icon.png</image>
- <name>spr_image</name>
- <size>12,32</size>
- <anchor>10,10</anchor>
-</sprite> \ 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
--- /dev/null
+++ b/Samples/Hello/tiledmap/boat.tiledmap
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Ѵassetexternݴ
+extern="boat.tiledmap"
+} \ No newline at end of file