diff options
author | Norbert Preining <norbert@preining.info> | 2020-08-07 03:02:55 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2020-08-07 03:02:55 +0000 |
commit | 3710c23789342d9d88783cbe9ad23eb5263a7c33 (patch) | |
tree | 1c40b2bfb9f6b652f7877ad0991f5d6b44391154 /graphics/asymptote/material.h | |
parent | d99fea72e367e8d4d2809b43b3b0206b1bb526b8 (diff) |
CTAN sync 202008070302
Diffstat (limited to 'graphics/asymptote/material.h')
-rw-r--r-- | graphics/asymptote/material.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/graphics/asymptote/material.h b/graphics/asymptote/material.h index d6a6084ae5..f16f421e52 100644 --- a/graphics/asymptote/material.h +++ b/graphics/asymptote/material.h @@ -14,17 +14,17 @@ namespace camp { inline bool operator < (const glm::vec4& m1, const glm::vec4& m2) { - return m1[0] < m2[0] || + return m1[0] < m2[0] || (m1[0] == m2[0] && - (m1[1] < m2[1] || + (m1[1] < m2[1] || (m1[1] == m2[1] && - (m1[2] < m2[2] || + (m1[2] < m2[2] || (m1[2] == m2[2] && (m1[3] < m2[3])))))); } inline glm::vec4 GLparameters(GLfloat shininess, GLfloat metallic, - GLfloat fresnel0) { + GLfloat fresnel0) { return glm::vec4(shininess,metallic,fresnel0,0.0); } @@ -42,7 +42,7 @@ public: Material() {} Material(const glm::vec4& diffuse, const glm::vec4& emissive, - const glm::vec4& specular, double shininess, double metallic, double fresnel0) : + const glm::vec4& specular, double shininess, double metallic, double fresnel0) : diffuse(diffuse), emissive(emissive), specular(specular), parameters(GLparameters(shininess,metallic,fresnel0)) {} @@ -57,19 +57,19 @@ public: emissive=m.emissive; specular=m.specular; parameters=m.parameters; - return *this; + return *this; } - + friend bool operator < (const Material& m1, const Material& m2) { return m1.diffuse < m2.diffuse || - (m1.diffuse == m2.diffuse && + (m1.diffuse == m2.diffuse && (m1.emissive < m2.emissive || - (m1.emissive == m2.emissive && - (m1.specular < m2.specular || - (m1.specular == m2.specular && - (m1.parameters < m2.parameters)))))); + (m1.emissive == m2.emissive && + (m1.specular < m2.specular || + (m1.specular == m2.specular && + (m1.parameters < m2.parameters)))))); } - + friend ostream& operator << (ostream& out, const Material& m) { out << "diffuse=" << m.diffuse << "," << newl << "emissive=" << m.emissive << "," << newl @@ -80,7 +80,7 @@ public: return out; } -}; +}; extern size_t Nmaterials; // Number of materials compiled in shader extern size_t nmaterials; // Current size of materials buffer |