summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
Diffstat (limited to 'Source')
-rw-r--r--Source/Asura.Framework/Class.lua6
-rw-r--r--Source/Asura.Framework/Filesystem/gameobject_loader.lua1
-rw-r--r--Source/Asura.Framework/GameObject.lua59
-rw-r--r--Source/Asura.Framework/Graphics/Material.lua10
-rw-r--r--Source/Asura.Framework/Graphics/material_manager.lua2
-rw-r--r--Source/Asura.Framework/class.lua6
-rw-r--r--Source/Asura.Framework/entity.lua59
-rw-r--r--Source/Asura.Framework/filesystem/gameobject_loader.lua1
-rw-r--r--Source/Asura.Framework/gameobject.lua59
-rw-r--r--Source/Asura.Framework/graphics/material.lua10
-rw-r--r--Source/Asura.Framework/graphics/material_manager.lua2
11 files changed, 79 insertions, 136 deletions
diff --git a/Source/Asura.Framework/Class.lua b/Source/Asura.Framework/Class.lua
index 78c577c..bec3e9a 100644
--- a/Source/Asura.Framework/Class.lua
+++ b/Source/Asura.Framework/Class.lua
@@ -1,3 +1,5 @@
-function Class()
+local Class = {}
-end \ No newline at end of file
+
+
+AsuraEngine.Class = Class \ No newline at end of file
diff --git a/Source/Asura.Framework/Filesystem/gameobject_loader.lua b/Source/Asura.Framework/Filesystem/gameobject_loader.lua
index e69de29..b2234dc 100644
--- a/Source/Asura.Framework/Filesystem/gameobject_loader.lua
+++ b/Source/Asura.Framework/Filesystem/gameobject_loader.lua
@@ -0,0 +1 @@
+local GameObjectLoader = \ No newline at end of file
diff --git a/Source/Asura.Framework/GameObject.lua b/Source/Asura.Framework/GameObject.lua
deleted file mode 100644
index 1b328ca..0000000
--- a/Source/Asura.Framework/GameObject.lua
+++ /dev/null
@@ -1,59 +0,0 @@
-local GameObject = AsuraEngine.Asset.SubClass("GameObject")
-
-function GameObject:OnEnable()
-
-end
-
-function GameObject:OnEvent(e)
-
-end
-
-function GameObject:OnUpdate(dt)
-
-end
-
-function GameObject:OnRender()
-
-end
-
-function GameObject:OnDisable()
-
-end
-
-function GameObject:GetTrasform()
-
-end
-
-function GameObject:GetPosition()
-
-end
-
-function GameObject:GetScale()
-
-end
-
-function GameObject:GetRotation()
-
-end
-
-function GameObject:SetTrasform(transform)
-
-end
-
-function GameObject:SetPosition()
-
-end
-
-function GameObject:SetScale()
-
-end
-
-function GameObject:SetRotation()
-
-end
-
-function GameObject:ToAsset()
-
-end
-
-return GameObject \ No newline at end of file
diff --git a/Source/Asura.Framework/Graphics/Material.lua b/Source/Asura.Framework/Graphics/Material.lua
index 5f7a7fa..0ba970c 100644
--- a/Source/Asura.Framework/Graphics/Material.lua
+++ b/Source/Asura.Framework/Graphics/Material.lua
@@ -1,22 +1,22 @@
--[[
-ʣǶshaderĴ
+material是shader的代理
]]
local Material = AsuraEngine.Class()
-function Material:Ctor()
-
+function Material:Ctor()
+
end
function Material:ToAsset()
end
-function Material:GetUniform(id, value)
+function Material:GetUniform(name)
end
function Material:SendFloat()
-
+
end
function Material:GetUniformID()
diff --git a/Source/Asura.Framework/Graphics/material_manager.lua b/Source/Asura.Framework/Graphics/material_manager.lua
index 46cc13d..086a5db 100644
--- a/Source/Asura.Framework/Graphics/material_manager.lua
+++ b/Source/Asura.Framework/Graphics/material_manager.lua
@@ -1,5 +1,3 @@
local MaterialManager = AsuraEngine.Manager.New()
-
-
return MaterialManager \ No newline at end of file
diff --git a/Source/Asura.Framework/class.lua b/Source/Asura.Framework/class.lua
index 78c577c..bec3e9a 100644
--- a/Source/Asura.Framework/class.lua
+++ b/Source/Asura.Framework/class.lua
@@ -1,3 +1,5 @@
-function Class()
+local Class = {}
-end \ No newline at end of file
+
+
+AsuraEngine.Class = Class \ No newline at end of file
diff --git a/Source/Asura.Framework/entity.lua b/Source/Asura.Framework/entity.lua
new file mode 100644
index 0000000..ffd9b65
--- /dev/null
+++ b/Source/Asura.Framework/entity.lua
@@ -0,0 +1,59 @@
+local Entity = AsuraEngine.Asset.SubClass("Entity")
+
+function Entity:OnEnable()
+
+end
+
+function Entity:OnEvent(e)
+
+end
+
+function Entity:OnUpdate(dt)
+
+end
+
+function Entity:OnRender()
+
+end
+
+function Entity:OnDisable()
+
+end
+
+function Entity:GetTrasform()
+
+end
+
+function Entity:GetPosition()
+
+end
+
+function Entity:GetScale()
+
+end
+
+function Entity:GetRotation()
+
+end
+
+function Entity:SetTrasform(transform)
+
+end
+
+function Entity:SetPosition()
+
+end
+
+function Entity:SetScale()
+
+end
+
+function Entity:SetRotation()
+
+end
+
+function Entity:ToAsset()
+
+end
+
+return Entity \ No newline at end of file
diff --git a/Source/Asura.Framework/filesystem/gameobject_loader.lua b/Source/Asura.Framework/filesystem/gameobject_loader.lua
index e69de29..b2234dc 100644
--- a/Source/Asura.Framework/filesystem/gameobject_loader.lua
+++ b/Source/Asura.Framework/filesystem/gameobject_loader.lua
@@ -0,0 +1 @@
+local GameObjectLoader = \ No newline at end of file
diff --git a/Source/Asura.Framework/gameobject.lua b/Source/Asura.Framework/gameobject.lua
deleted file mode 100644
index 1b328ca..0000000
--- a/Source/Asura.Framework/gameobject.lua
+++ /dev/null
@@ -1,59 +0,0 @@
-local GameObject = AsuraEngine.Asset.SubClass("GameObject")
-
-function GameObject:OnEnable()
-
-end
-
-function GameObject:OnEvent(e)
-
-end
-
-function GameObject:OnUpdate(dt)
-
-end
-
-function GameObject:OnRender()
-
-end
-
-function GameObject:OnDisable()
-
-end
-
-function GameObject:GetTrasform()
-
-end
-
-function GameObject:GetPosition()
-
-end
-
-function GameObject:GetScale()
-
-end
-
-function GameObject:GetRotation()
-
-end
-
-function GameObject:SetTrasform(transform)
-
-end
-
-function GameObject:SetPosition()
-
-end
-
-function GameObject:SetScale()
-
-end
-
-function GameObject:SetRotation()
-
-end
-
-function GameObject:ToAsset()
-
-end
-
-return GameObject \ No newline at end of file
diff --git a/Source/Asura.Framework/graphics/material.lua b/Source/Asura.Framework/graphics/material.lua
index 5f7a7fa..0ba970c 100644
--- a/Source/Asura.Framework/graphics/material.lua
+++ b/Source/Asura.Framework/graphics/material.lua
@@ -1,22 +1,22 @@
--[[
-ʣǶshaderĴ
+material是shader的代理
]]
local Material = AsuraEngine.Class()
-function Material:Ctor()
-
+function Material:Ctor()
+
end
function Material:ToAsset()
end
-function Material:GetUniform(id, value)
+function Material:GetUniform(name)
end
function Material:SendFloat()
-
+
end
function Material:GetUniformID()
diff --git a/Source/Asura.Framework/graphics/material_manager.lua b/Source/Asura.Framework/graphics/material_manager.lua
index 46cc13d..086a5db 100644
--- a/Source/Asura.Framework/graphics/material_manager.lua
+++ b/Source/Asura.Framework/graphics/material_manager.lua
@@ -1,5 +1,3 @@
local MaterialManager = AsuraEngine.Manager.New()
-
-
return MaterialManager \ No newline at end of file