X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fmaterial.cpp;fp=source%2Fmaterial.cpp;h=b5ec6a5cd913209940acdd68558f1dc072fda8aa;hb=927a1aa0a3a27e463ec0efc08bd08e7c4e969909;hp=310834f3554a50619dcc404f066a269ca952d666;hpb=56c9bfa0b47583fb9067705a69c3639a17d4a097;p=libs%2Fgl.git diff --git a/source/material.cpp b/source/material.cpp index 310834f3..b5ec6a5c 100644 --- a/source/material.cpp +++ b/source/material.cpp @@ -66,7 +66,7 @@ const Material *Material::current=0; Material::Loader::Loader(Material &m): - mat(m) + DataFile::ObjectLoader(m) { add("ambient", &Loader::ambient); add("diffuse", &Loader::diffuse); @@ -77,22 +77,22 @@ Material::Loader::Loader(Material &m): void Material::Loader::ambient(float r, float g, float b, float a) { - mat.ambient=GL::Color(r, g, b, a); + obj.ambient=GL::Color(r, g, b, a); } void Material::Loader::diffuse(float r, float g, float b, float a) { - mat.diffuse=GL::Color(r, g, b, a); + obj.diffuse=GL::Color(r, g, b, a); } void Material::Loader::specular(float r, float g, float b, float a) { - mat.specular=GL::Color(r, g, b, a); + obj.specular=GL::Color(r, g, b, a); } void Material::Loader::emission(float r, float g, float b, float a) { - mat.emission=GL::Color(r, g, b, a); + obj.emission=GL::Color(r, g, b, a); } } // namespace GL