From 5bb908f081f9f41a01160205cfd8458eaacfc908 Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Tue, 22 Sep 2015 12:34:47 -0700 Subject: [PATCH] remove dead code and fix warning --- libraries/model/src/model/Material.cpp | 12 ------------ libraries/model/src/model/Material.h | 2 -- 2 files changed, 14 deletions(-) diff --git a/libraries/model/src/model/Material.cpp b/libraries/model/src/model/Material.cpp index cf91836254..c2ff828af3 100755 --- a/libraries/model/src/model/Material.cpp +++ b/libraries/model/src/model/Material.cpp @@ -15,18 +15,6 @@ using namespace model; using namespace gpu; -float componentSRGBToLinear(float cs) { - if (cs > 0.04045) { - return pow(((cs + 0.055)/1.055), 2.4); - } else { - return cs / 12.92; - } -} - -glm::vec3 convertSRGBToLinear(const glm::vec3& srgb) { - return glm::vec3(componentSRGBToLinear(srgb.x), componentSRGBToLinear(srgb.y), componentSRGBToLinear(srgb.z)); -} - Material::Material() : _key(0), _schemaBuffer(), diff --git a/libraries/model/src/model/Material.h b/libraries/model/src/model/Material.h index 0e7388f722..b0725d9908 100755 --- a/libraries/model/src/model/Material.h +++ b/libraries/model/src/model/Material.h @@ -20,8 +20,6 @@ namespace model { -static glm::vec3 convertSRGBToLinear(const glm::vec3& srgb); - class TextureMap; typedef std::shared_ptr< TextureMap > TextureMapPointer;