From 91c32cb173201ac8803a1e4452e8342969b8e484 Mon Sep 17 00:00:00 2001 From: chai Date: Fri, 29 Oct 2021 13:36:49 +0800 Subject: *GLSL test --- Runtime/Graphics/Shader.h | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'Runtime/Graphics/Shader.h') diff --git a/Runtime/Graphics/Shader.h b/Runtime/Graphics/Shader.h index 614e127..4e0dc37 100644 --- a/Runtime/Graphics/Shader.h +++ b/Runtime/Graphics/Shader.h @@ -11,9 +11,9 @@ class Shader : public LuaBind::NativeClass { public: - Shader(LuaBind::VM*vm, bool keepSrc = false)/*throw(ShaderCompileExecption)*/; - Shader(LuaBind::VM*vm, std::string& glslShader, bool keepSrc = false)/*throw(ShaderCompileExecption)*/; - Shader(LuaBind::VM*vm, const char* vert, const char* frag, bool keepSrc = false)/*throw(ShaderCompileExecption)*/; + Shader(LuaBind::VM*vm)/*throw(ShaderCompileExecption)*/; + Shader(LuaBind::VM*vm, std::string& glslShader)/*throw(ShaderCompileExecption)*/; + Shader(LuaBind::VM*vm, const char* vert, const char* frag)/*throw(ShaderCompileExecption)*/; ~Shader(); void ReCompile(std::string& vert, std::string frag)/*throw(ShaderCompileExecption)*/; @@ -27,11 +27,6 @@ public: private: void CompileProgram(const char* vert, const char* frag, bool keepSrc = false); - bool m_KeepSrc; - - std::string m_VertSrc; - std::string m_FragSrc; - GLint m_ProgramID; GLint m_FragID; GLint m_VertID; @@ -42,9 +37,16 @@ private: LUA_BIND_DECL_METHOD(_ReCompile); LUA_BIND_DECL_METHOD(_ReCompileVert); LUA_BIND_DECL_METHOD(_ReCompileFrag); - LUA_BIND_DECL_METHOD(_IsValid); - LUA_BIND_DECL_METHOD(_GetVertCode); - LUA_BIND_DECL_METHOD(_GetFragCode); + LUA_BIND_DECL_METHOD(_IsValid); + LUA_BIND_DECL_METHOD(_Use); + LUA_BIND_DECL_METHOD(_UnUse); + + LUA_BIND_DECL_METHOD(_SetVector2); + LUA_BIND_DECL_METHOD(_SetVector3); + LUA_BIND_DECL_METHOD(_SetVector4); + LUA_BIND_DECL_METHOD(_SetMatrix3); + LUA_BIND_DECL_METHOD(_SetMatrix4); + //LUA_BIND_DECL_METHOD(_SetColor); }; -- cgit v1.1-26-g67d0