Merge commit 'f7cbbfdffb2ee015d077331e658081b6717c3b1a' into main

mooflu · mooflu · commit 045d96d3e5b6 · 2023-10-27T17:06:05.000-07:00
diff --git a/mooflu.common/utilsgl/GLTextureCubeMap.cpp b/mooflu.common/utilsgl/GLTextureCubeMap.cpp
@@ -94,7 +94,10 @@ void GLTextureCubeMap::init(void) {
 #endif
 }
 
-void GLTextureCubeMap::reload(void) {
+void GLTextureCubeMap::reset(void) {
     TextureManagerS::instance()->removeTexture(this);
+}
+
+void GLTextureCubeMap::reload(void) {
     init();
 }
diff --git a/mooflu.common/utilsgl/GLTextureCubeMap.hpp b/mooflu.common/utilsgl/GLTextureCubeMap.hpp
@@ -43,6 +43,7 @@ class GLTextureCubeMap : public GLTextureI {
 
     void unbind(void) { glBindTexture(GL_TEXTURE_CUBE_MAP_ARB, 0); }
 
+    void reset(void);
     void reload(void);
 
 private:

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,10 @@ void GLTextureCubeMap::init(void) {`
`94`	`94`	`#endif`
`95`	`95`	`}`
`96`	`96`
`97`		`-void GLTextureCubeMap::reload(void) {`
	`97`	`+void GLTextureCubeMap::reset(void) {`
`98`	`98`	`TextureManagerS::instance()->removeTexture(this);`
	`99`	`+}`
	`100`	`+`
	`101`	`+void GLTextureCubeMap::reload(void) {`
`99`	`102`	`init();`
`100`	`103`	`}`