From 0c65330f29d214cdfd810e83096669c5f2c20bee Mon Sep 17 00:00:00 2001 From: chai Date: Sun, 20 Jan 2019 19:42:03 +0800 Subject: *misc --- Samples/Hello/scripts/components/fireball.lua.asr | 0 Samples/Hello/scripts/components/fireball.lua.asset | 4 ++++ Samples/Hello/scripts/components/fly.lua | 0 Samples/Hello/scripts/components/fly.lua.asset | 0 Samples/Hello/scripts/components/move.lua | 0 Samples/Hello/scripts/components/move.lua.asset | 0 Samples/Hello/scripts/entities/bullet.lua.asr | 3 --- Samples/Hello/scripts/entities/bullet.lua.asset | 4 ++++ Samples/Hello/scripts/entities/spark.lua.asr | 0 Samples/Hello/scripts/entities/spark.lua.asset | 4 ++++ Samples/Hello/scripts/hello.lua.asset | 4 ++++ Samples/Hello/scripts/hello.lua.axm | 3 --- Samples/Hello/scripts/material_loader.lua | 16 ++++++++++++++++ Samples/Hello/scripts/material_loader.lua.asset | 0 Samples/Hello/scripts/tiledmapimporter.lua | 8 +++++--- Samples/Hello/scripts/tiledmapimporter.lua.asset | 0 Samples/Hello/scripts/tiledmapimporter.lua.axm | 0 17 files changed, 37 insertions(+), 9 deletions(-) delete mode 100644 Samples/Hello/scripts/components/fireball.lua.asr create mode 100644 Samples/Hello/scripts/components/fireball.lua.asset create mode 100644 Samples/Hello/scripts/components/fly.lua create mode 100644 Samples/Hello/scripts/components/fly.lua.asset create mode 100644 Samples/Hello/scripts/components/move.lua create mode 100644 Samples/Hello/scripts/components/move.lua.asset delete mode 100644 Samples/Hello/scripts/entities/bullet.lua.asr create mode 100644 Samples/Hello/scripts/entities/bullet.lua.asset delete mode 100644 Samples/Hello/scripts/entities/spark.lua.asr create mode 100644 Samples/Hello/scripts/entities/spark.lua.asset create mode 100644 Samples/Hello/scripts/hello.lua.asset delete mode 100644 Samples/Hello/scripts/hello.lua.axm create mode 100644 Samples/Hello/scripts/material_loader.lua create mode 100644 Samples/Hello/scripts/material_loader.lua.asset create mode 100644 Samples/Hello/scripts/tiledmapimporter.lua.asset delete mode 100644 Samples/Hello/scripts/tiledmapimporter.lua.axm (limited to 'Samples/Hello/scripts') diff --git a/Samples/Hello/scripts/components/fireball.lua.asr b/Samples/Hello/scripts/components/fireball.lua.asr deleted file mode 100644 index e69de29..0000000 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/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.asset b/Samples/Hello/scripts/components/fly.lua.asset new file mode 100644 index 0000000..e69de29 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.asset b/Samples/Hello/scripts/components/move.lua.asset new file mode 100644 index 0000000..e69de29 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 @@ - \ 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.asr b/Samples/Hello/scripts/entities/spark.lua.asr deleted file mode 100644 index e69de29..0000000 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 @@ - \ 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 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") --tiledmap是tag，表明了tiledmap +local TiledMapLoader = AsuraEngine.Importer.New("tiledmap") --tiledmap是tag，表明了tiledmap 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 diff --git a/Samples/Hello/scripts/tiledmapimporter.lua.axm b/Samples/Hello/scripts/tiledmapimporter.lua.axm deleted file mode 100644 index e69de29..0000000 -- cgit v1.1-26-g67d0