X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Frenderer.cpp;h=6bbfbbe0d0785628b89d1ec7c84608b2f0905b93;hb=274b6fb1b02692cc422bad9040d1abe5d545505a;hp=fceee6e8c631f71cacfb3a3ce908ad65cce8afc1;hpb=7b1a814276741e1aff68c6e9066537374c19c283;p=libs%2Fgl.git

diff --git a/source/render/renderer.cpp b/source/render/renderer.cpp
index fceee6e8..6bbfbbe0 100644
--- a/source/render/renderer.cpp
+++ b/source/render/renderer.cpp
@@ -21,6 +21,9 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
+const Tag Renderer::world_obj_matrix_tag("world_obj_matrix");
+const Tag Renderer::world_obj_normal_matrix_tag("world_obj_normal_matrix");
+
 Renderer::Renderer():
 	placeholder_texture(Resources::get_global().get<Texture>("_placeholder.png"))
 {
@@ -358,10 +361,10 @@ void Renderer::apply_state()
 
 	if(changed&MATRIX)
 	{
-		standard_shdata.uniform("world_obj_matrix", state.model_matrix);
-		LinAl::SquareMatrix<float, 3> nm = state.model_matrix.block<3, 3>(0, 0);
+		standard_shdata.uniform(world_obj_matrix_tag, state.model_matrix);
+		LinAl::Matrix<float, 3, 3> nm = state.model_matrix.block<3, 3>(0, 0);
 		nm = transpose(invert(nm));
-		standard_shdata.uniform("world_obj_normal_matrix", nm);
+		standard_shdata.uniform(world_obj_normal_matrix_tag, nm);
 		changed &= ~MATRIX;
 		shdata_changed = true;
 	}