Merge pull request #258 from Bigfoot71/master

RobLoach · web-flow · commit a3c520ae57d5 · 2023-10-09T12:05:42.000-04:00
Added overloads for const std::string&amp; and const char* arguments
diff --git a/include/Shader.hpp b/include/Shader.hpp
@@ -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.
      *
@@ -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)
 

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,10 @@ class Shader : public ::Shader {`
`45`	`45`	`return ::LoadShader(vsFileName.c_str(), fsFileName.c_str());`
`46`	`46`	`}`
`47`	`47`
	`48`	`+ static ::Shader Load(const char* vsFileName, const char* fsFileName) {`
	`49`	`+ return ::LoadShader(vsFileName, fsFileName);`
	`50`	`+ }`
	`51`	`+`
`48`	`52`	`/**`
`49`	`53`	`* Load a shader from memory.`
`50`	`54`	`*`
`@@ -54,6 +58,10 @@ class Shader : public ::Shader {`
`54`	`58`	`return ::LoadShaderFromMemory(vsCode.c_str(), fsCode.c_str());`
`55`	`59`	`}`
`56`	`60`
	`61`	`+ static ::Shader LoadFromMemory(const char* vsCode, const char* fsCode) {`
	`62`	`+ return ::LoadShaderFromMemory(vsCode, fsCode);`
	`63`	`+ }`
	`64`	`+`
`57`	`65`	`GETTERSETTER(unsigned int, Id, id)`
`58`	`66`	`GETTERSETTER(int*, Locs, locs)`
`59`	`67`