From 684f71790401727cc45f4dad1822ddae46305072 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Mon, 25 Feb 2019 09:07:37 +0800
Subject: +widgets

---
 Source/Asura.Framework/scripts/graphics/material.lua |  2 +-
 Source/Asura.Framework/scripts/graphics/shader.lua   | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'Source/Asura.Framework/scripts/graphics')

diff --git a/Source/Asura.Framework/scripts/graphics/material.lua b/Source/Asura.Framework/scripts/graphics/material.lua
index f347789..e985b3c 100644
--- a/Source/Asura.Framework/scripts/graphics/material.lua
+++ b/Source/Asura.Framework/scripts/graphics/material.lua
@@ -15,7 +15,7 @@ end
 function Material:ToAsset()
 
 end
-
+  
 function Material:GetUniform(name)
 
 end
diff --git a/Source/Asura.Framework/scripts/graphics/shader.lua b/Source/Asura.Framework/scripts/graphics/shader.lua
index a886481..728ab34 100644
--- a/Source/Asura.Framework/scripts/graphics/shader.lua
+++ b/Source/Asura.Framework/scripts/graphics/shader.lua
@@ -3,13 +3,21 @@ AsuraEngine.Shader = AsuraEngine.Asset.Sub("Shader")
 local Shader = AsuraEngine.Shader
 
 function Shader.Ctor(self, vert, frag)
-	local simShader = AsuraEngine.simShader(vert, frag)
-	self.simShader = shader
+	self.simShader = AsuraEngine.SimShader.New(vert, frag)
+	self.uniforms = {} -- 映射uniform name到location
+end
 
+function Shader.GetUniformLocation(self, name)
+	if self.uniforms then 
+		local id = self.uniforms[name]
+		return id
+	end 
+	return 0
 end
 
 function Shader.SendVec2(self, name, vec2)
-
+	local id = self:GetUniformLocation(name)
+	self.simShader:SendUniformVector2(name, vec2)
 end
 
 function Shader.SendVec3(self, name, vec3)
-- 
cgit v1.1-26-g67d0