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

draw slightly lower damaged tile model for damaged tiles

Browse Source
This commit is contained in:
Josh Holtrop 2012-10-04 00:30:16 -04:00
parent 81eda3f71d
commit 11a9b70522
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,6 +142,11 @@ bool Client::initgl()
cerr << "Error loading hex-tile model" << endl; cerr << "Error loading hex-tile model" << endl;
return false; return false;
} }
if (!m_tile_damaged_obj.load("models/hex-tile-damaged.obj", load_file))
{
cerr << "Error loading hex-tile-damaged model" << endl;
return false;
}
if (!m_overlay_hex_attributes.create(GL_ARRAY_BUFFER, GL_STATIC_DRAW, if (!m_overlay_hex_attributes.create(GL_ARRAY_BUFFER, GL_STATIC_DRAW,
overlay_hex_attributes, sizeof(overlay_hex_attributes))) overlay_hex_attributes, sizeof(overlay_hex_attributes)))
{ {
@ -327,14 +332,8 @@ void Client::draw_map()
{ {
m_obj_program.use(); m_obj_program.use();
m_projection.to_uniform(m_obj_program.uniform("projection")); m_projection.to_uniform(m_obj_program.uniform("projection"));
m_tile_obj.bindBuffers();
glEnableVertexAttribArray(0); glEnableVertexAttribArray(0);
glEnableVertexAttribArray(1); glEnableVertexAttribArray(1);
int stride = m_tile_obj.getStride();
glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE,
stride, (GLvoid *) m_tile_obj.getVertexOffset());
glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE,
stride, (GLvoid *) m_tile_obj.getNormalOffset());
const int width = m_map.get_width(); const int width = m_map.get_width();
const int height = m_map.get_height(); const int height = m_map.get_height();
for (int y = 0; y < height; y++) for (int y = 0; y < height; y++)
@ -345,15 +344,26 @@ void Client::draw_map()
(m_map.get_tile(x,y)->get_damage_state() < HexTile::DESTROYED)) (m_map.get_tile(x,y)->get_damage_state() < HexTile::DESTROYED))
{ {
refptr<HexTile> tile = m_map.get_tile(x, y); refptr<HexTile> tile = m_map.get_tile(x, y);
WFObj & obj = (tile->get_damage_state() == HexTile::DAMAGED)
? m_tile_damaged_obj
: m_tile_obj;
obj.bindBuffers();
int stride = obj.getStride();
glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE,
stride, (GLvoid *) obj.getVertexOffset());
glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE,
stride, (GLvoid *) obj.getNormalOffset());
float cx = tile->get_x(); float cx = tile->get_x();
float cy = tile->get_y(); float cy = tile->get_y();
m_modelview.push(); m_modelview.push();
m_modelview.translate(cx, cy, 0); m_modelview.translate(cx, cy, 0);
if (tile->get_damage_state() == HexTile::DAMAGED)
m_modelview.translate(0, 0, -1);
m_modelview.scale(tile->get_size(), tile->get_size(), tile->get_size()); m_modelview.scale(tile->get_size(), tile->get_size(), tile->get_size());
m_modelview.to_uniform(m_obj_program.uniform("modelview")); m_modelview.to_uniform(m_obj_program.uniform("modelview"));
for (map<string, WFObj::Material>::iterator it = for (map<string, WFObj::Material>::iterator it =
m_tile_obj.getMaterials().begin(); obj.getMaterials().begin();
it != m_tile_obj.getMaterials().end(); it != obj.getMaterials().end();
it++) it++)
{ {
WFObj::Material & m = it->second; WFObj::Material & m = it->second;

1
src/client/Client.h
View File

@ -53,6 +53,7 @@ class Client
GLProgram m_shot_ring_program; GLProgram m_shot_ring_program;
WFObj m_tank_obj; WFObj m_tank_obj;
WFObj m_tile_obj; WFObj m_tile_obj;
WFObj m_tile_damaged_obj;
GLMatrix m_projection; GLMatrix m_projection;
GLMatrix m_modelview; GLMatrix m_modelview;
GLBuffer m_overlay_hex_attributes; GLBuffer m_overlay_hex_attributes;