Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-05 07:39:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5876 from ZappoMan/fixWarning

Browse source 
remove dead code and fix warning
This commit is contained in:
Seth Alves 2015-09-22 13:33:17 -07:00
commit e7999fa7f5
2 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libraries/model/src/model/Material.cpp
View file

@ -15,18 +15,6 @@
using namespace model; using namespace model;
using namespace gpu; 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() : Material::Material() :
_key(0), _key(0),
_schemaBuffer(), _schemaBuffer(),

2
libraries/model/src/model/Material.h
View file

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