Skip to content

ofCubeMap: Android define around regenerateAllTextures() #8399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danoli3 merged 1 commit into from
Mar 28, 2025
Merged

ofCubeMap: Android define around regenerateAllTextures() #8399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion libs/openFrameworks/gl/ofCubeMap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -855,7 +855,7 @@ void ofCubeMap::_createIrradianceMap(GLuint aSrcCubeFid, bool aBMakeCache, const
std::vector<glm::mat4> 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();
Expand Down
2 changes: 2 additions & 0 deletions libs/openFrameworks/gl/ofCubeMap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@ class ofCubeMap {
static bool hasActiveCubeMap();
static std::shared_ptr<ofCubeMap::Data> getActiveData();
static void clearTextureData(std::shared_ptr<ofCubeMap::Data> adata);
#ifdef TARGET_ANDROID
static void regenerateAllTextures();
#endif
static const ofTexture & getBrdfLutTexture();

ofCubeMap();
Expand Down
2 changes: 1 addition & 1 deletion libs/openFrameworks/gl/ofCubeMapShaders.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ class ofCubeMapShaders {
return rsource;
}

static ShaderSource irriadianceCubeMap() {
static ShaderSource irradianceCubeMap() {
ShaderSource rsource;
rsource.vertShader = defaultVertShader();

Expand Down