summaryrefslogtreecommitdiff
path: root/Source/Asura.Engine/Graphics/Shader.h
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2019-03-01 08:50:34 +0800
committerchai <chaifix@163.com>2019-03-01 08:50:34 +0800
commit64d9d7b3eb7cece81da8b2cb56eb0f50d87a5964 (patch)
tree12bde99e5415f77f60f8873a66d09bfd3b84ec48 /Source/Asura.Engine/Graphics/Shader.h
parente28a7d48d032fe7fd4c8789e95fbc659873a0adc (diff)
*misc
Diffstat (limited to 'Source/Asura.Engine/Graphics/Shader.h')
-rw-r--r--Source/Asura.Engine/Graphics/Shader.h13
1 files changed, 6 insertions, 7 deletions
diff --git a/Source/Asura.Engine/Graphics/Shader.h b/Source/Asura.Engine/Graphics/Shader.h
index 2cc482b..831f5c3 100644
--- a/Source/Asura.Engine/Graphics/Shader.h
+++ b/Source/Asura.Engine/Graphics/Shader.h
@@ -5,8 +5,8 @@
#include <string>
#include "Scripting/Luax.hpp"
-#include "Math/Vector2.h"
-#include "Math/Vector3.h"
+#include "Math/Vector2.hpp"
+#include "Math/Vector3.hpp"
#include "Math/Vector4.h"
#include "Math/Matrix44.h"
#include "StringMap.hpp"
@@ -15,7 +15,6 @@
#include "Manager.hpp"
#include "Texture.h"
#include "GL.h"
-#include "SimClass.h"
namespace AsuraEngine
{
@@ -26,7 +25,7 @@ namespace AsuraEngine
/// һshaderһڲʼ乲ijShaderuniformsͶݣֻṩuniformsuseɫķ༭
/// ÿshaderͨshaderҵuniforms¶frameworkmaterialá
///
- class Shader final : virtual public Object, public SimClass
+ class Shader final : virtual public Object
{
public:
@@ -54,9 +53,9 @@ namespace AsuraEngine
///
void SetUniformFloat(uint loc, float value);
void SetUniformTexture(uint loc, const Texture& texture);
- void SetUniformVector2(uint loc, const Math::Vector2& vec2);
- void SetUniformVector3(uint loc, const Math::Vector3& vec3);
- void SetUniformVector4(uint loc, const Math::Vector4& vec4);
+ void SetUniformVector2(uint loc, const Math::Vector2f& vec2);
+ void SetUniformVector3(uint loc, const Math::Vector3f& vec3);
+ void SetUniformVector4(uint loc, const Math::Vector4f& vec4);
void SetUniformColor(uint loc, const Color& color);
void SetUniformMatrix44(uint loc, const Math::Matrix44& mat44);