summaryrefslogtreecommitdiff
path: root/graphics/asymptote/material.h
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/asymptote/material.h')
-rw-r--r--graphics/asymptote/material.h28
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