summaryrefslogtreecommitdiff
path: root/Samples/Hello/scripts
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2019-01-31 18:38:35 +0800
committerchai <chaifix@163.com>2019-01-31 18:38:35 +0800
commit2ec55fd974a63b705a4777c256d2222c874fa043 (patch)
tree48f1fea59ee9fc713a28a9aac3f05b98dc5ae66f /Samples/Hello/scripts
parentc581dfbf1e849f393861d15e82aa6446c0c1c310 (diff)
*SDL project
Diffstat (limited to 'Samples/Hello/scripts')
-rw-r--r--Samples/Hello/scripts/components.folder.asset4
-rw-r--r--Samples/Hello/scripts/entities.folder.asset4
-rw-r--r--Samples/Hello/scripts/material_loader.lua14
-rw-r--r--Samples/Hello/scripts/tiledmap_importer.lua4
4 files changed, 15 insertions, 11 deletions
diff --git a/Samples/Hello/scripts/components.folder.asset b/Samples/Hello/scripts/components.folder.asset
index ae3c0c2..84dcfcb 100644
--- a/Samples/Hello/scripts/components.folder.asset
+++ b/Samples/Hello/scripts/components.folder.asset
@@ -1,4 +1,4 @@
{
- type="folder",
- extern="components"
+ type="folder",
+ extern="folder"
} \ 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/material_loader.lua b/Samples/Hello/scripts/material_loader.lua
index 628ca3b..2e9b771 100644
--- a/Samples/Hello/scripts/material_loader.lua
+++ b/Samples/Hello/scripts/material_loader.lua
@@ -2,15 +2,15 @@ local MaterialLoader = AsuraEngine.Importer.New("material")
local MaterialManager = require "MaterialManager.lua"
function MaterialLoader.Load(mat)
- local shader = AsuraEngine.Shader.GetShader(mat.shader)
+ local shader = AsuraEngine.Shader.GetShader(mat.shader)
+ if shader == nil then
+ shader = AsuraEngine.Shader.New(mat.shader)
if shader == nil then
- shader = AsuraEngine.Shader.New(mat.shader)
- if shader == nil then
- return nil
- end
+ return nil
end
- local material = AsuraEngine.Class()
- return material
+ end
+ local material = AsuraEngine.Class()
+ return material
end
return MaterialLoader \ No newline at end of file
diff --git a/Samples/Hello/scripts/tiledmap_importer.lua b/Samples/Hello/scripts/tiledmap_importer.lua
index 782c840..d15a089 100644
--- a/Samples/Hello/scripts/tiledmap_importer.lua
+++ b/Samples/Hello/scripts/tiledmap_importer.lua
@@ -2,8 +2,8 @@ local TiledMapLoader = AsuraEngine.Importer.New("tiledmap") --tiledmaptag
local TiledMapManager = require "TiledMapManager.lua"
function TiledMapLoader:Load( asset, data )
-
-
+
+
end
return TiledMapLoader \ No newline at end of file