diff options
Diffstat (limited to 'Samples/Hello')
| -rw-r--r-- | Samples/Hello/editor/card_editor.lua | 12 | ||||
| -rw-r--r-- | Samples/Hello/gfx/icon.png.image.asset | 2 | ||||
| -rw-r--r-- | Samples/Hello/loaders/tiledmap_loader.lua | 12 | ||||
| -rw-r--r-- | Samples/Hello/scripts/components.folder.asset | 4 | ||||
| -rw-r--r-- | Samples/Hello/scripts/entities.folder.asset | 4 | ||||
| -rw-r--r-- | Samples/Hello/scripts/material_loader.lua | 14 | ||||
| -rw-r--r-- | Samples/Hello/scripts/tiledmap_importer.lua | 4 | ||||
| -rw-r--r-- | Samples/Hello/shaders/sh_thunder.shader.asset | 8 |
8 files changed, 38 insertions, 22 deletions
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/gfx/icon.png.image.asset b/Samples/Hello/gfx/icon.png.image.asset index 6dcae7c..7ab112c 100644 --- a/Samples/Hello/gfx/icon.png.image.asset +++ b/Samples/Hello/gfx/icon.png.image.asset @@ -1,5 +1,5 @@ { type="image", - guid=jhaklsdhjksdhfkjshdj, + guid=jhaklsdhjksdhfkjshdj, extern="icon.png" }
\ No newline at end of file diff --git a/Samples/Hello/loaders/tiledmap_loader.lua b/Samples/Hello/loaders/tiledmap_loader.lua index 5c0e9ef..8bc06d4 100644 --- a/Samples/Hello/loaders/tiledmap_loader.lua +++ b/Samples/Hello/loaders/tiledmap_loader.lua @@ -2,12 +2,12 @@ local TiledMapLoader = Class() local TiledMapManager = require("/managers/TiledMapManager") function TiledMapLoader:Load(asset, tiledmap) - if asset.type ~= "tiledmap" then - return nil - end - - - + if asset.type ~= "tiledmap" then + return nil + end + + + end return TiledMapLoader
\ No newline at end of file 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 diff --git a/Samples/Hello/shaders/sh_thunder.shader.asset b/Samples/Hello/shaders/sh_thunder.shader.asset index 9972dda..7403ce0 100644 --- a/Samples/Hello/shaders/sh_thunder.shader.asset +++ b/Samples/Hello/shaders/sh_thunder.shader.asset @@ -1,9 +1,9 @@ { type="shader", uniforms={ - {text="", name="", type="float", value=1} - } - vertex=[[ + {text="", name="", type="float", value=1} + } + vertex=[[ void main() { @@ -14,5 +14,5 @@ void main() { } - ]] + ]] }
\ No newline at end of file |
