From 20286826fa4f6fb7ed1615f143e652b782e6d19f Mon Sep 17 00:00:00 2001 From: NickHardeman Date: Wed, 26 Mar 2025 14:07:29 -0400 Subject: [PATCH] Android define around regenerateAllTextures() and spelling correct for irradianceMap() --- libs/openFrameworks/gl/ofCubeMap.cpp | 2 +- libs/openFrameworks/gl/ofCubeMap.h | 2 ++ libs/openFrameworks/gl/ofCubeMapShaders.h | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/openFrameworks/gl/ofCubeMap.cpp b/libs/openFrameworks/gl/ofCubeMap.cpp index 16f3b5ea2af..258d3491196 100644 --- a/libs/openFrameworks/gl/ofCubeMap.cpp +++ b/libs/openFrameworks/gl/ofCubeMap.cpp @@ -855,7 +855,7 @@ void ofCubeMap::_createIrradianceMap(GLuint aSrcCubeFid, bool aBMakeCache, const std::vector views = _getViewMatrices( glm::vec3(0,0,0) ); if( !shaderIrradianceMap.isLoaded() ) { - auto isource = ofCubeMapShaders::irriadianceCubeMap(); + auto isource = ofCubeMapShaders::irradianceCubeMap(); shaderIrradianceMap.setupShaderFromSource(GL_VERTEX_SHADER, isource.vertShader ); shaderIrradianceMap.setupShaderFromSource(GL_FRAGMENT_SHADER, isource.fragShader ); shaderIrradianceMap.bindDefaults(); diff --git a/libs/openFrameworks/gl/ofCubeMap.h b/libs/openFrameworks/gl/ofCubeMap.h index 0752053b9f9..ceef3e6bd3a 100644 --- a/libs/openFrameworks/gl/ofCubeMap.h +++ b/libs/openFrameworks/gl/ofCubeMap.h @@ -63,7 +63,9 @@ class ofCubeMap { static bool hasActiveCubeMap(); static std::shared_ptr getActiveData(); static void clearTextureData(std::shared_ptr adata); + #ifdef TARGET_ANDROID static void regenerateAllTextures(); + #endif static const ofTexture & getBrdfLutTexture(); ofCubeMap(); diff --git a/libs/openFrameworks/gl/ofCubeMapShaders.h b/libs/openFrameworks/gl/ofCubeMapShaders.h index 465b968d725..aa79695d0f9 100644 --- a/libs/openFrameworks/gl/ofCubeMapShaders.h +++ b/libs/openFrameworks/gl/ofCubeMapShaders.h @@ -103,7 +103,7 @@ class ofCubeMapShaders { return rsource; } - static ShaderSource irriadianceCubeMap() { + static ShaderSource irradianceCubeMap() { ShaderSource rsource; rsource.vertShader = defaultVertShader();