X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frender%2Frenderer.cpp;h=2b1503ce23c847b025b75325e2b7e2cb13960a53;hp=fceee6e8c631f71cacfb3a3ce908ad65cce8afc1;hb=b84ce32a8dfcacd54c3497c6e7facb5d65e82827;hpb=7b1a814276741e1aff68c6e9066537374c19c283 diff --git a/source/render/renderer.cpp b/source/render/renderer.cpp index fceee6e8..2b1503ce 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("_placeholder.png")) { @@ -358,10 +361,10 @@ void Renderer::apply_state() if(changed&MATRIX) { - standard_shdata.uniform("world_obj_matrix", state.model_matrix); + standard_shdata.uniform(world_obj_matrix_tag, state.model_matrix); LinAl::SquareMatrix 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; }