eqemu
diff src/material.cc @ 4:3d3656360a82
rendering properly, added picking, almost done...
author | John Tsiombikas <nuclear@member.fsf.org> |
---|---|
date | Thu, 17 Jul 2014 08:51:17 +0300 |
parents | f9274bebe55e |
children | 9b5bb05ae53a |
line diff
1.1 --- a/src/material.cc Thu Jul 17 02:35:19 2014 +0300 1.2 +++ b/src/material.cc Thu Jul 17 08:51:17 2014 +0300 1.3 @@ -2,7 +2,7 @@ 1.4 #include "material.h" 1.5 1.6 Material::Material() 1.7 - : color(1, 1, 1), specular(0, 0, 0) 1.8 + : diffuse(1, 1, 1), specular(0, 0, 0) 1.9 { 1.10 shininess = 1.0; 1.11 alpha = 1.0; 1.12 @@ -10,7 +10,7 @@ 1.13 1.14 void Material::setup() const 1.15 { 1.16 - float col[] = {color.x, color.y, color.z, alpha}; 1.17 + float col[] = {diffuse.x, diffuse.y, diffuse.z, alpha}; 1.18 glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, col); 1.19 1.20 float spec[] = {specular.x, specular.y, specular.z, 1.0};