- /* diffuse */
- int diff_loc;
- if((diff_loc = sprog->get_uniform_location("diffuse")) != -1) {
- sprog->set_uniformf(diff_loc, m->diffuse.x, m->diffuse.y, m->diffuse.z);
+
+ /* setting uniforms for material */
+
+ fu.diffuse = Vec4(m->diffuse.x, m->diffuse.y, m->diffuse.z, 1.0);
+ fu.specular = Vec4(m->specular.x, m->specular.y, m->specular.z, 1.0);
+ fu.shininess = m->shininess;
+ fu.fog_density = fog_density;
+
+ fbuf->update(&fu);
+ fbuf->bind(SHADING_UNIFORMS);
+
+ /* texture */
+
+ if(m->dtex)
+ m->dtex->bind(0);
+
+ /* setting uniforms for matrices */
+
+ vu.mview = object->transform * camera->get_view_matrix();
+ vu.mmviewproj = object->transform * camera->get_view_matrix() * mprojection;
+ vu.mmod = object->transform.upper3x3();
+
+ vbuf->update(&vu);
+ vbuf->bind(MATRIX_UNIFORMS);
+
+ object->mesh->draw();
+
+ // debug
+#ifdef DRAW_NORMALS
+ if(nprog) {
+ vu.mmviewproj = mmviewproj;
+ vbuf->update(&vu);
+ vbuf->bind(MATRIX_UNIFORMS);
+
+ nprog->use();
+ object->mesh->draw_normals(1.0);