From 84aecf957c4df03e7d43b730837ce4e3501c8e7c Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Thu, 13 Sep 2012 23:47:48 -0400 Subject: [PATCH] draw each tile with its own size --- src/client/Client-gl.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/client/Client-gl.cc b/src/client/Client-gl.cc index 9490a06..6a5123e 100644 --- a/src/client/Client-gl.cc +++ b/src/client/Client-gl.cc @@ -215,8 +215,6 @@ void Client::draw_map() { const int width = m_map.get_width(); const int height = m_map.get_height(); - const float tile_size = 50; - glUniform1f(OBJ_SCALE, tile_size); m_projection.to_uniform(OBJ_PROJECTION); m_tile_obj.bindBuffers(); glEnableVertexAttribArray(0); @@ -232,11 +230,13 @@ void Client::draw_map() { if (m_map.tile_present(x, y)) { + refptr tile = m_map.get_tile(x, y); + float cx = tile->get_x(); + float cy = tile->get_y(); m_modelview.push(); - float cx = m_map.get_tile(x, y)->get_x(); - float cy = m_map.get_tile(x, y)->get_y(); m_modelview.translate(cx, cy, 0); m_modelview.to_uniform(OBJ_MODELVIEW); + glUniform1f(OBJ_SCALE, tile->get_size()); for (map::iterator it = m_tile_obj.getMaterials().begin(); it != m_tile_obj.getMaterials().end();