X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderer.cpp;h=45cf241e8ec3798ab0a0368c389b8794fa11f5d3;hb=bfc7f104c642590fd85577a6545c6bc6259ccaa4;hp=01c17a26ef8cc3ce5019bea833a3224e7c54e19c;hpb=346ed5bd91f10489acd280e2165a951d6938f0df;p=libs%2Fgl.git

diff --git a/source/renderer.cpp b/source/renderer.cpp
index 01c17a26..45cf241e 100644
--- a/source/renderer.cpp
+++ b/source/renderer.cpp
@@ -22,11 +22,9 @@ namespace Msp {
 namespace GL {
 
 Renderer::Renderer(const Camera *c):
-	mtx_stack(*this),
 	changed(0),
 	matrices_loaded(false),
 	shdata_applied(0),
-	camera(0),
 	state_stack(1)
 {
 	state_stack.reserve(16);
@@ -48,28 +46,29 @@ void Renderer::begin(const Camera *c)
 
 	reset_state();
 	excluded.clear();
-	camera = c;
 
-	if(camera)
-	{
-		mtx_stack.load(camera->get_matrix());
-		standard_shdata.uniform("projection_matrix", camera->get_projection_matrix());
-	}
-	else
-	{
-		mtx_stack.load(MatrixStack::modelview().top());
-		standard_shdata.uniform("projection_matrix", MatrixStack::projection().top());
-	}
+	if(c)
+		set_camera(*c);
+}
+
+void Renderer::set_camera(const Camera &c)
+{
+	state->camera = &c;
+	standard_shdata.uniform("projection_matrix", state->camera->get_projection_matrix());
+	changed |= STANDARD_SHDATA|LEGACY_PROJECTION;
+	set_matrix(state->camera->get_view_matrix());
 }
 
 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)
@@ -98,10 +97,10 @@ void Renderer::set_material(const Material *m)
 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());
+		l->update_shader_data(standard_shdata, state->lighting_matrix);
 		changed |= STANDARD_SHDATA;
 	}
 	changed |= LEGACY_LIGHTING;
@@ -110,9 +109,12 @@ void Renderer::set_lighting(const Lighting *l)
 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());
+	{
+		c->update_shader_data(standard_shdata, state->clipping_matrix);
+		changed |= STANDARD_SHDATA;
+	}
 	changed |= LEGACY_CLIPPING;
 }
 
@@ -149,7 +151,6 @@ void Renderer::push_state()
 {
 	state_stack.push_back(state_stack.back());
 	state = &state_stack.back();
-	mtx_stack.push();
 }
 
 void Renderer::pop_state()
@@ -157,6 +158,7 @@ void Renderer::pop_state()
 	if(state_stack.size()==1)
 		throw stack_underflow("Renderer::pop_state");
 
+	const Camera *old_camera = state->camera;
 	const Lighting *old_lighting = state->lighting;
 	const Clipping *old_clipping = state->clipping;
 	state_stack.pop_back();
@@ -167,18 +169,28 @@ void Renderer::pop_state()
 		changed |= SHADER_DATA;
 	}
 	shdata_applied = min<unsigned>(shdata_applied, shdata_stack.size());
-	mtx_stack.pop();
 	changed |= MATRIX;
+	if(state->camera!=old_camera)
+	{
+		standard_shdata.uniform("projection_matrix", state->camera->get_projection_matrix());
+		changed |= STANDARD_SHDATA|LEGACY_PROJECTION;
+	}
 	if(state->lighting!=old_lighting)
 	{
 		if(state->lighting)
+		{
 			state->lighting->update_shader_data(standard_shdata, state->lighting_matrix);
+			changed |= STANDARD_SHDATA;
+		}
 		changed |= LEGACY_LIGHTING;
 	}
 	if(state->clipping!=old_clipping)
 	{
 		if(state->clipping)
+		{
 			state->clipping->update_shader_data(standard_shdata, state->clipping_matrix);
+			changed |= STANDARD_SHDATA;
+		}
 		changed |= LEGACY_CLIPPING;
 	}
 }
@@ -304,9 +316,8 @@ 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 = (changed&~MODERN_MATRIX)|STANDARD_SHDATA;
@@ -367,17 +378,19 @@ void Renderer::apply_state()
 		if(!matrices_loaded)
 		{
 			MatrixStack::modelview().push();
-			if(camera)
-			{
-				MatrixStack::projection().push();
-				camera->apply();
-			}
+			MatrixStack::projection().push();
 			matrices_loaded = true;
 		}
 
+		if(changed&LEGACY_PROJECTION)
+		{
+			MatrixStack::projection() = state->camera->get_projection_matrix();
+			changed &= ~LEGACY_PROJECTION;
+		}
+
 		if(changed&LEGACY_MATRIX)
 		{
-			MatrixStack::modelview() = mtx_stack.top();
+			MatrixStack::modelview() = state->modelview_matrix;
 			changed &= ~LEGACY_MATRIX;
 		}
 	}
@@ -399,6 +412,7 @@ void Renderer::reset_state()
 
 
 Renderer::State::State():
+	camera(0),
 	texture(0),
 	texturing(0),
 	lowest_effect_texunit(TexUnit::get_n_units()),
@@ -412,15 +426,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