- /* 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);
- }
- /* specular */
- int spec_loc;
- if((spec_loc = sprog->get_uniform_location("specular")) != -1) {
- sprog->set_uniformf(spec_loc, m->specular.x, m->specular.y, m->specular.z);
+
+ /* setting uniforms for material */
+
+ sprog->set_uniformf(diff_loc, m->diffuse.x, m->diffuse.y, m->diffuse.z, 1);
+ sprog->set_uniformf(spec_loc, m->specular.x, m->specular.y, m->specular.z, 1);
+ sprog->set_uniformf(shin_loc, m->shininess);
+
+ /* texture */
+
+ if(m->dtex)
+ m->dtex->bind();
+
+ /* setting uniforms for matrices */
+
+ Mat4 mmviewproj = object->transform * camera->get_view_matrix() * mprojection;
+ sprog->set_uniform_matrix(mmviewproj_loc, mmviewproj);
+
+ Mat4 mview = object->transform * camera->get_view_matrix();
+ sprog->set_uniform_matrix(mview_loc, mview);
+
+ object->mesh->update_vertex_data();
+ object->mesh->draw();
+}
+
+void Renderer::set_sky_tex(Texture *stex)
+{
+ if(!skymesh) {
+ skymesh = gfx_create_mesh();
+ gen_geosphere(skymesh, 1, 0);