From 931cde802e5af1395e30e5ce7b178c9a360199f5 Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Mon, 11 Oct 2010 15:56:39 +0000 Subject: [PATCH] moved Material constructor into Material.h, removed Material.cc git-svn-id: svn://anubis/fart/trunk@375 7f9b0f55-74a9-4bce-be96-3c2cd072584d --- util/Material.cc | 12 ------------ util/Material.h | 11 ++++++++++- 2 files changed, 10 insertions(+), 13 deletions(-) delete mode 100644 util/Material.cc diff --git a/util/Material.cc b/util/Material.cc deleted file mode 100644 index 8311887..0000000 --- a/util/Material.cc +++ /dev/null @@ -1,12 +0,0 @@ - -#include "Material.h" - -Material::Material() -{ - m_ambient_color = Color::white; - m_diffuse_color = Color::white; - m_specular_color = Color::white; - m_shininess = 50.0; - m_reflectance = 0.0; - m_transparency = 0.0; -} diff --git a/util/Material.h b/util/Material.h index 703322b..42c3940 100644 --- a/util/Material.h +++ b/util/Material.h @@ -7,7 +7,16 @@ class Material { public: - Material(); + Material() + { + m_ambient_color = Color::white; + m_diffuse_color = Color::white; + m_specular_color = Color::white; + m_shininess = 50.0; + m_reflectance = 0.0; + m_transparency = 0.0; + m_refraction = 1.0; + } void setAmbientColor(const Color & ambient) {