josh/treacherous-terrain
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

draw tile borders in overlay map

Browse Source
This commit is contained in:
Josh Holtrop 2012-09-16 14:13:00 -04:00
parent c095df40d4
commit 23b4177962
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/client/Client-gl.cc
View File

@ -289,8 +289,8 @@ void Client::draw_overlay()
proj.ortho(-span, span, -span, span, -1, 1); proj.ortho(-span, span, -span, span, -1, 1);
proj.to_uniform(m_overlay_program.uniform("projection")); proj.to_uniform(m_overlay_program.uniform("projection"));
GLMatrix modelview; GLMatrix modelview;
GLfloat hex_color[] = {0.2, 0.2, 0.8, 0.4}; GLfloat hex_color[] = {0.2, 0.8, 0.8, 0.3};
glUniform4fv(m_overlay_program.uniform("color"), 1, hex_color); GLfloat border_color[] = {0.4, 0.9, 0.9, 1.0};
m_overlay_hex_attributes.bind(); m_overlay_hex_attributes.bind();
m_overlay_hex_indices.bind(); m_overlay_hex_indices.bind();
glEnableVertexAttribArray(0); glEnableVertexAttribArray(0);
@ -311,8 +311,12 @@ void Client::draw_overlay()
modelview.translate(cx, cy, 0); modelview.translate(cx, cy, 0);
modelview.scale(tile->get_size(), tile->get_size(), tile->get_size()); modelview.scale(tile->get_size(), tile->get_size(), tile->get_size());
modelview.to_uniform(m_overlay_program.uniform("modelview")); modelview.to_uniform(m_overlay_program.uniform("modelview"));
glUniform4fv(m_overlay_program.uniform("color"), 1, hex_color);
glDrawElements(GL_TRIANGLE_FAN, LEN(overlay_hex_indices), glDrawElements(GL_TRIANGLE_FAN, LEN(overlay_hex_indices),
GL_UNSIGNED_SHORT, NULL); GL_UNSIGNED_SHORT, NULL);
glUniform4fv(m_overlay_program.uniform("color"), 1, border_color);
glDrawElements(GL_LINE_LOOP, LEN(overlay_hex_indices) - 2,
GL_UNSIGNED_SHORT, (GLvoid *)(sizeof(GLushort)));
modelview.pop(); modelview.pop();
} }
} }