From ae5ef6d94860d98061bbc68b5b42c19968ebba13 Mon Sep 17 00:00:00 2001 From: Geenz Date: Tue, 26 Apr 2016 17:00:59 -0400 Subject: [PATCH] Remove toLinearVec3 from ColorUtils toGamma22Vec3 should probably stay since that is a valid conversion from linear to a gamma space of 2.2. --- libraries/shared/src/ColorUtils.h | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/libraries/shared/src/ColorUtils.h b/libraries/shared/src/ColorUtils.h index 47e7520afa..5ee9254bc9 100644 --- a/libraries/shared/src/ColorUtils.h +++ b/libraries/shared/src/ColorUtils.h @@ -21,8 +21,7 @@ class ColorUtils { public: inline static glm::vec3 toVec3(const xColor& color); - // Convert from gamma 2.2 space to linear - inline static glm::vec3 toLinearVec3(const glm::vec3& srgb); + // Convert to gamma 2.2 space from linear inline static glm::vec3 toGamma22Vec3(const glm::vec3& linear); // Convert from sRGB gamma space to linear. @@ -42,12 +41,6 @@ inline glm::vec3 ColorUtils::toVec3(const xColor& color) { return glm::vec3(color.red * ONE_OVER_255, color.green * ONE_OVER_255, color.blue * ONE_OVER_255); } -inline glm::vec3 ColorUtils::toLinearVec3(const glm::vec3& srgb) { - const float GAMMA_22 = 2.2f; - // Couldn't find glm::pow(vec3, vec3) ? so did it myself... - return glm::vec3(glm::pow(srgb.x, GAMMA_22), glm::pow(srgb.y, GAMMA_22), glm::pow(srgb.z, GAMMA_22)); -} - inline glm::vec3 ColorUtils::toGamma22Vec3(const glm::vec3& linear) { const float INV_GAMMA_22 = 1.0f / 2.2f; // Couldn't find glm::pow(vec3, vec3) ? so did it myself...