X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderer.cpp;h=3bef74b34039aa1db1db907eb648eff17ae69771;hb=f632bf388a58b036e265f3789c797beff5ab063a;hp=8daa13ce414bbc508a6924064ac282392a7bfb5c;hpb=46a18e3112a0a44963dad256e20ffb146a5043b5;p=libs%2Fgl.git

diff --git a/source/renderer.cpp b/source/renderer.cpp
index 8daa13ce..3bef74b3 100644
--- a/source/renderer.cpp
+++ b/source/renderer.cpp
@@ -22,7 +22,6 @@ namespace Msp {
 namespace GL {
 
 Renderer::Renderer(const Camera *c):
-	mtx_stack(*this),
 	changed(0),
 	matrices_loaded(false),
 	shdata_applied(0),
@@ -52,24 +51,26 @@ void Renderer::begin(const Camera *c)
 
 	if(camera)
 	{
-		mtx_stack.load(camera->get_matrix());
+		state->modelview_matrix = camera->get_view_matrix();
 		standard_shdata.uniform("projection_matrix", camera->get_projection_matrix());
 	}
 	else
 	{
-		mtx_stack.load(MatrixStack::modelview().top());
+		state->modelview_matrix = MatrixStack::modelview().top();
 		standard_shdata.uniform("projection_matrix", MatrixStack::projection().top());
 	}
 }
 
 void Renderer::set_matrix(const Matrix &matrix)
 {
-	mtx_stack.load(matrix);
+	state->modelview_matrix = matrix;
+	changed |= MATRIX;
 }
 
 void Renderer::transform(const Matrix &matrix)
 {
-	mtx_stack *= matrix;
+	state->modelview_matrix *= matrix;
+	changed |= MATRIX;
 }
 
 void Renderer::set_texture(const Texture *t)
@@ -92,24 +93,28 @@ unsigned Renderer::allocate_effect_texunit()
 void Renderer::set_material(const Material *m)
 {
 	state->material = m;
+	changed |= MATERIAL_SHDATA;
 }
 
 void Renderer::set_lighting(const Lighting *l)
 {
 	state->lighting = l;
-	state->lighting_matrix = mtx_stack.top();
+	state->lighting_matrix = state->modelview_matrix;
 	if(l)
-		l->update_shader_data(standard_shdata, mtx_stack.top());
-	changed |= LIGHTING;
+	{
+		l->update_shader_data(standard_shdata, state->lighting_matrix);
+		changed |= STANDARD_SHDATA;
+	}
+	changed |= LEGACY_LIGHTING;
 }
 
 void Renderer::set_clipping(const Clipping *c)
 {
 	state->clipping = c;
-	state->clipping_matrix = mtx_stack.top();
+	state->clipping_matrix = state->modelview_matrix;
 	if(c)
-		c->update_shader_data(standard_shdata, mtx_stack.top());
-	changed |= CLIPPING;
+		c->update_shader_data(standard_shdata, state->clipping_matrix);
+	changed |= LEGACY_CLIPPING;
 }
 
 void Renderer::set_shader_program(const Program *p, const ProgramData *d)
@@ -145,7 +150,6 @@ void Renderer::push_state()
 {
 	state_stack.push_back(state_stack.back());
 	state = &state_stack.back();
-	mtx_stack.push();
 }
 
 void Renderer::pop_state()
@@ -163,19 +167,18 @@ void Renderer::pop_state()
 		changed |= SHADER_DATA;
 	}
 	shdata_applied = min<unsigned>(shdata_applied, shdata_stack.size());
-	mtx_stack.pop();
 	changed |= MATRIX;
 	if(state->lighting!=old_lighting)
 	{
 		if(state->lighting)
 			state->lighting->update_shader_data(standard_shdata, state->lighting_matrix);
-		changed |= LIGHTING;
+		changed |= LEGACY_LIGHTING;
 	}
 	if(state->clipping!=old_clipping)
 	{
 		if(state->clipping)
 			state->clipping->update_shader_data(standard_shdata, state->clipping_matrix);
-		changed |= CLIPPING;
+		changed |= LEGACY_CLIPPING;
 	}
 }
 
@@ -261,13 +264,13 @@ void Renderer::apply_state()
 		else
 			Material::unbind();
 
-		if(changed&LIGHTING)
+		if(changed&LEGACY_LIGHTING)
 		{
 			if(state->lighting)
 			{
 				MatrixStack::modelview() = state->lighting_matrix;
 				state->lighting->bind();
-				changed = (changed&~LIGHTING)|LEGACY_MATRIX;
+				changed = (changed&~LEGACY_LIGHTING)|LEGACY_MATRIX;
 			}
 			else
 				Lighting::unbind();
@@ -278,11 +281,11 @@ void Renderer::apply_state()
 	{
 		if(legacy_bindings)
 		{
-			if(changed&CLIPPING)
+			if(changed&LEGACY_CLIPPING)
 			{
 				MatrixStack::modelview() = state->clipping_matrix;
 				state->clipping->bind(true);
-				changed = (changed&~CLIPPING)|LEGACY_MATRIX;
+				changed = (changed&~LEGACY_CLIPPING)|LEGACY_MATRIX;
 			}
 		}
 		else
@@ -300,17 +303,24 @@ void Renderer::apply_state()
 		{
 			if(changed&MODERN_MATRIX)
 			{
-				const Matrix &m = mtx_stack.top();
-				standard_shdata.uniform("eye_obj_matrix", mtx_stack.top());
-				LinAl::SquareMatrix<float, 3> nm = m.block<3, 3>(0, 0);
+				standard_shdata.uniform("eye_obj_matrix", state->modelview_matrix);
+				LinAl::SquareMatrix<float, 3> nm = state->modelview_matrix.block<3, 3>(0, 0);
 				nm = transpose(invert(nm));
 				standard_shdata.uniform_matrix3("eye_obj_normal_matrix", &nm(0, 0));
-				changed &= ~MODERN_MATRIX;
+				changed = (changed&~MODERN_MATRIX)|STANDARD_SHDATA;
 			}
 
-			if(state->material)
+			if(state->material && (changed&MATERIAL_SHDATA))
+			{
 				state->material->get_shader_data().apply();
-			standard_shdata.apply();
+				changed &= ~MATERIAL_SHDATA;
+			}
+
+			if(changed&STANDARD_SHDATA)
+			{
+				standard_shdata.apply();
+				changed &= ~STANDARD_SHDATA;
+			}
 		}
 
 		if((changed&SHADER_DATA) || shprog_changed)
@@ -365,7 +375,7 @@ void Renderer::apply_state()
 
 		if(changed&LEGACY_MATRIX)
 		{
-			MatrixStack::modelview() = mtx_stack.top();
+			MatrixStack::modelview() = state->modelview_matrix;
 			changed &= ~LEGACY_MATRIX;
 		}
 	}
@@ -400,15 +410,5 @@ Renderer::State::State():
 	reverse_winding(false)
 { }
 
-
-Renderer::MtxStack::MtxStack(Renderer &r):
-	renderer(r)
-{ }
-
-void Renderer::MtxStack::update()
-{
-	renderer.changed |= MATRIX;
-}
-
 } // namespace GL
 } // namespace Msp