Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions include/Shader.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ class Shader : public ::Shader {
return ::LoadShader(vsFileName.c_str(), fsFileName.c_str());
}

static ::Shader Load(const char* vsFileName, const char* fsFileName) {
return ::LoadShader(vsFileName, fsFileName);
}

/**
* Load a shader from memory.
*
Expand All @@ -54,6 +58,10 @@ class Shader : public ::Shader {
return ::LoadShaderFromMemory(vsCode.c_str(), fsCode.c_str());
}

static ::Shader LoadFromMemory(const char* vsCode, const char* fsCode) {
return ::LoadShaderFromMemory(vsCode, fsCode);
}

GETTERSETTER(unsigned int, Id, id)
GETTERSETTER(int*, Locs, locs)

Expand Down