remove dead code and fix warning

This commit is contained in:
Brad Hefta-Gaub 2015-09-22 12:34:47 -07:00
parent 0072b6d7d0
commit 5bb908f081
2 changed files with 0 additions and 14 deletions

View file

@ -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(),

View file

@ -20,8 +20,6 @@
namespace model {
static glm::vec3 convertSRGBToLinear(const glm::vec3& srgb);
class TextureMap;
typedef std::shared_ptr< TextureMap > TextureMapPointer;