ApfelTeeSaft/vb01
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/vb01.git synced 2026-08-26 19:33:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

materials are now created by specifying shaders

Browse Source 
shader uniforms are added to materials
This commit is contained in:
devZoGok
2021-11-10 20:23:15 +02:00
parent 34e7a74bba
commit ec8dd7ac1e
17 changed files with 321 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shader.h
+4 -2
View File
@@ -14,8 +14,9 @@ namespace vb01{
enum ShaderType{VERTEX_SHADER, FRAGMENT_SHADER, GEOMETRY_SHADER};
Shader(){}
Shader(std::string, std::string, std::string = "");
Shader(std::string, bool = false);
~Shader();
std::string getName();
void setNumLights(int);
void use();
void setMat4(glm::mat4, std::string);
@@ -26,6 +27,7 @@ namespace vb01{
void setBool(bool, std::string);
void setInt(int, std::string);
void editShader(ShaderType, int, std::string);
inline bool isGeometry(){return geometry;}
private:
void initShaders(std::string, std::string, std::string);
void replaceLine(ShaderType, int, std::string);
@@ -34,7 +36,7 @@ namespace vb01{
void checkCompileErrors(u32, ErrorType);
u32 id;
bool geometry = false;
std::string vString, fString, gString;
std::string path, vString, fString, gString;
friend class ShaderTest;
};