From 14c54b13021b8512f784fa9d943d7567f6ebf2f5 Mon Sep 17 00:00:00 2001 From: chai Date: Mon, 21 Jan 2019 20:26:33 +0800 Subject: *packer --- Source/Asura.Framework/Graphics/Animation.lua | 3 ++- Source/Asura.Framework/Graphics/Camera.lua | 2 -- Source/Asura.Framework/Graphics/Material.lua | 12 ++++++++++-- Source/Asura.Framework/Graphics/Renderer.lua | 3 +++ 4 files changed, 15 insertions(+), 5 deletions(-) (limited to 'Source/Asura.Framework/Graphics') diff --git a/Source/Asura.Framework/Graphics/Animation.lua b/Source/Asura.Framework/Graphics/Animation.lua index b73cdd8..8b52683 100644 --- a/Source/Asura.Framework/Graphics/Animation.lua +++ b/Source/Asura.Framework/Graphics/Animation.lua @@ -1,5 +1,6 @@ +--把animation asset加入默认资源 local Animation = AsuraEngine.Asset.New("animation") -return Animation \ No newline at end of file +AsuraEngine.Animation = Animation \ No newline at end of file diff --git a/Source/Asura.Framework/Graphics/Camera.lua b/Source/Asura.Framework/Graphics/Camera.lua index 4c18f96..41d4394 100644 --- a/Source/Asura.Framework/Graphics/Camera.lua +++ b/Source/Asura.Framework/Graphics/Camera.lua @@ -4,6 +4,4 @@ Camera.mIsOnScreen = false Camera.mIsCulling = false - - return Camera \ No newline at end of file diff --git a/Source/Asura.Framework/Graphics/Material.lua b/Source/Asura.Framework/Graphics/Material.lua index 5875efc..5f7a7fa 100644 --- a/Source/Asura.Framework/Graphics/Material.lua +++ b/Source/Asura.Framework/Graphics/Material.lua @@ -4,14 +4,22 @@ local Material = AsuraEngine.Class() function Material:Ctor() - + end function Material:ToAsset() end -function Material:GetUniform() +function Material:GetUniform(id, value) + +end + +function Material:SendFloat() + +end + +function Material:GetUniformID() end diff --git a/Source/Asura.Framework/Graphics/Renderer.lua b/Source/Asura.Framework/Graphics/Renderer.lua index e69de29..1e44c73 100644 --- a/Source/Asura.Framework/Graphics/Renderer.lua +++ b/Source/Asura.Framework/Graphics/Renderer.lua @@ -0,0 +1,3 @@ +local Renderer = Class() + +return Renderer \ No newline at end of file -- cgit v1.1-26-g67d0