diff --git a/libs/openFrameworks/gl/ofCubeMap.h b/libs/openFrameworks/gl/ofCubeMap.h index 4a79e88fde9..9b77b7aa891 100644 --- a/libs/openFrameworks/gl/ofCubeMap.h +++ b/libs/openFrameworks/gl/ofCubeMap.h @@ -97,7 +97,7 @@ class ofCubeMap { void drawPrefilteredCube(float aRoughness); bool isEnabled() { return data->isEnabled; } - const bool isEnabled() const { return data->isEnabled; } + bool isEnabled() const { return data->isEnabled; } void setEnabled(bool ab) { data->isEnabled = ab; } bool hasCubeMap(); diff --git a/libs/openFrameworks/gl/ofMaterial.h b/libs/openFrameworks/gl/ofMaterial.h index 8295723cf33..c75c1d4ddf2 100644 --- a/libs/openFrameworks/gl/ofMaterial.h +++ b/libs/openFrameworks/gl/ofMaterial.h @@ -182,7 +182,7 @@ class ofMaterial : public ofBaseMaterial { /// \brief is this material pbr. Setting PBR functions or textures will automatically set the material to pbr.\nCan also be set calling setPBR(bool); /// \return is the material pbr. - const bool isPBR() const { return data.isPbr; } + bool isPBR() const { return data.isPbr; } /// \brief enable or disable PBR for this material. Default is disabled. void setPBR(bool ab); diff --git a/libs/openFrameworks/gl/ofShader.cpp b/libs/openFrameworks/gl/ofShader.cpp index 54ac8ab094a..fc65da70cbc 100644 --- a/libs/openFrameworks/gl/ofShader.cpp +++ b/libs/openFrameworks/gl/ofShader.cpp @@ -439,7 +439,7 @@ string ofShader::parseForIncludes(const string & source, const of::filesystem::p string ofShader::parseForIncludes(const string & source, vector & included, int level, const of::filesystem::path & sourceDirectoryPath) { if (level > 32) { - ofLogError("ofShader", "glsl header inclusion depth limit reached, might be caused by cyclic header inclusion"); + ofLogError("ofShader") << "glsl header inclusion depth limit reached, might be caused by cyclic header inclusion"; return ""; } diff --git a/libs/openFrameworks/gl/ofShadow.cpp b/libs/openFrameworks/gl/ofShadow.cpp index 2d1147d3f0a..59236b78138 100644 --- a/libs/openFrameworks/gl/ofShadow.cpp +++ b/libs/openFrameworks/gl/ofShadow.cpp @@ -649,7 +649,7 @@ void ofShadow::setEnabled( bool ab ) { } //-------------------------------------------------------------- -const bool ofShadow::isMultiCubeFacePass() const { +bool ofShadow::isMultiCubeFacePass() const { if( data->lightType == OF_LIGHT_POINT ) { return !isSingleOmniPass(); } @@ -657,12 +657,12 @@ const bool ofShadow::isMultiCubeFacePass() const { } //-------------------------------------------------------------- -const bool ofShadow::isSingleOmniPass() const { +bool ofShadow::isSingleOmniPass() const { return mBSinglePass; } //-------------------------------------------------------------- -const int ofShadow::getNumShadowDepthPasses() const { +int ofShadow::getNumShadowDepthPasses() const { if(isMultiCubeFacePass()) { return 6; } @@ -1142,11 +1142,11 @@ void ofShadow::_updateNumShadows() { #include "shaders/shadowDepth.frag" #include "shaders/shadowDepthCubeGeom.glsl" -const bool ofShadow::setupShadowDepthShader(ofShader& ashader, const std::string aShaderMain) const { +bool ofShadow::setupShadowDepthShader(ofShader& ashader, const std::string aShaderMain) const { return setupShadowDepthShader( ashader, data->lightType, aShaderMain, isSingleOmniPass() ); } -const bool ofShadow::setupShadowDepthShader(ofShader& ashader, int aLightType, const std::string aShaderMain, bool abSinglePass) const { +bool ofShadow::setupShadowDepthShader(ofShader& ashader, int aLightType, const std::string aShaderMain, bool abSinglePass) const { std::string gversion = "#version 150\n"; #ifdef TARGET_OPENGLES diff --git a/libs/openFrameworks/gl/ofShadow.h b/libs/openFrameworks/gl/ofShadow.h index b65457dfd72..55938fe3ad5 100644 --- a/libs/openFrameworks/gl/ofShadow.h +++ b/libs/openFrameworks/gl/ofShadow.h @@ -126,9 +126,9 @@ class ofShadow { void setNearClip( float anear ) { data->nearClip = anear; } void setFarClip( float afar ) { data->farClip = afar; } - const bool isMultiCubeFacePass() const; - const bool isSingleOmniPass() const; - const int getNumShadowDepthPasses() const; + bool isMultiCubeFacePass() const; + bool isSingleOmniPass() const; + int getNumShadowDepthPasses() const; void setSingleOmniPass( bool ab ); int getDepthMapWidth(); int getDepthMapHeight(); @@ -148,13 +148,13 @@ class ofShadow { const float& getStrength() { return data->strength; } void setStrength(float astrength) { data->strength = astrength; } - const float getBias() { return data->bias; } + float getBias() const { return data->bias; } void setBias( float abias ) { data->bias = abias; } - const float getNormalBias() { return data->normalBias; } + float getNormalBias() const { return data->normalBias; } void setNormalBias( float abias ) { data->normalBias = abias; } - const float getSampleRadius() { return data->sampleRadius; } + float getSampleRadius() const { return data->sampleRadius; } void setSampleRadius( float aradius ) { data->sampleRadius = aradius; } void setAreaLightSize( float awidth, float aheight ) {mAreaLightWidth=awidth;mAreaLightHeight=aheight;}; @@ -165,8 +165,8 @@ class ofShadow { std::string getShadowTypeAsString(); const ofShader & getDepthShader(ofGLProgrammableRenderer & renderer) const; - const bool setupShadowDepthShader(ofShader& ashader, const std::string aShaderMain) const; - const bool setupShadowDepthShader(ofShader& ashader, int aLightType, const std::string aShaderMain, bool abSinglePass) const; + bool setupShadowDepthShader(ofShader& ashader, const std::string aShaderMain) const; + bool setupShadowDepthShader(ofShader& ashader, int aLightType, const std::string aShaderMain, bool abSinglePass) const; void updateDepth(const ofShader & shader,ofGLProgrammableRenderer & renderer) const; void updateDepth(const ofShader & shader,GLenum aCubeFace,ofGLProgrammableRenderer & renderer) const; diff --git a/libs/openFrameworks/graphics/ofImage.cpp b/libs/openFrameworks/graphics/ofImage.cpp index d2dd580306d..95a4d97da9b 100644 --- a/libs/openFrameworks/graphics/ofImage.cpp +++ b/libs/openFrameworks/graphics/ofImage.cpp @@ -533,7 +533,7 @@ static bool saveImage(const ofPixels_ & _pix, ofBuffer & buffer, ofIm ofInitFreeImage(); if (_pix.isAllocated() == false){ - ofLogError("ofImage","saveImage(): couldn't save to ofBuffer, pixels are not allocated"); + ofLogError("ofImage") << "saveImage(): couldn't save to ofBuffer, pixels are not allocated"; return false; }