oerkki/voxelands
oerkki
/
voxelands
2
1
Fork 1
Code Issues 19 Pull Requests Releases Activity

add camera offsetting to selection meshes

This commit is contained in:
darkrose 2015-11-20 18:32:27 +10:00
parent 5e1cf26d16
commit f43e69eda5
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game.cpp
View File

@ -2183,7 +2183,7 @@ void the_game(
} }
if (selected_nodes.size() > 0) if (selected_nodes.size() > 0)
selection_draw(driver,client,selected_nodes); selection_draw(driver,client,camera.getOffset(),selected_nodes);
/* draw old-style selection boxes */ /* draw old-style selection boxes */
if (hilightboxes.size()) { if (hilightboxes.size()) {

17
src/selection_mesh.cpp
View File

@ -28,6 +28,7 @@
static std::map<v3s16,SelectedNode> selected; static std::map<v3s16,SelectedNode> selected;
static std::vector<SelectionMesh*> meshes; static std::vector<SelectionMesh*> meshes;
static v3s16 o_camera_offset(0,0,0);
static void selection_clear() static void selection_clear()
{ {
@ -71,7 +72,7 @@ static void selection_generate(Client &client)
} }
} }
void selection_draw(video::IVideoDriver* driver, Client &client, std::vector<SelectedNode> &select) void selection_draw(video::IVideoDriver* driver, Client &client, v3s16 camera_offset, std::vector<SelectedNode> &select)
{ {
if (!select.size()) { if (!select.size()) {
if (selected.size()) if (selected.size())
@ -98,12 +99,22 @@ void selection_draw(video::IVideoDriver* driver, Client &client, std::vector<Sel
if (!match || nselected.size() != selected.size()) { if (!match || nselected.size() != selected.size()) {
selection_clear(); selection_clear();
selected.swap(nselected); selected.swap(nselected);
o_camera_offset = camera_offset;
selection_generate(client); selection_generate(client);
} }
if (!meshes.size()) if (!meshes.size())
return; return;
v3f cos_diff(0,0,0);
bool cos_changed = false;
if (camera_offset != o_camera_offset) {
cos_diff = intToFloat(o_camera_offset-camera_offset, BS);
o_camera_offset = camera_offset;
cos_changed = true;
}
bool render_trilinear = g_settings->getBool("trilinear_filter"); bool render_trilinear = g_settings->getBool("trilinear_filter");
bool render_bilinear = g_settings->getBool("bilinear_filter"); bool render_bilinear = g_settings->getBool("bilinear_filter");
bool render_anisotropic = g_settings->getBool("anisotropic_filter"); bool render_anisotropic = g_settings->getBool("anisotropic_filter");
@ -115,6 +126,8 @@ void selection_draw(video::IVideoDriver* driver, Client &client, std::vector<Sel
scene::SMesh *m = mesh->getMesh(); scene::SMesh *m = mesh->getMesh();
if (!m) if (!m)
continue; continue;
if (cos_changed)
translateMesh(m, cos_diff);
u32 c = m->getMeshBufferCount(); u32 c = m->getMeshBufferCount();
for (u32 i=0; i<c; i++) { for (u32 i=0; i<c; i++) {
@ -252,7 +265,7 @@ void SelectionMesh::generate(MeshMakeData *data)
buf->append(d.vertices.data(), d.vertices.size(), d.indices.data(), d.indices.size()); buf->append(d.vertices.data(), d.vertices.size(), d.indices.data(), d.indices.size());
} }
translateMesh(mesh, intToFloat(data->m_blockpos_nodes, BS)); translateMesh(mesh, intToFloat(data->m_blockpos_nodes - o_camera_offset, BS));
if (m_mesh) if (m_mesh)
m_mesh->drop(); m_mesh->drop();

2
src/selection_mesh.h
View File

@ -26,7 +26,7 @@
class Client; class Client;
void selection_draw(video::IVideoDriver* driver, Client &client, std::vector<SelectedNode> &select); void selection_draw(video::IVideoDriver* driver, Client &client, v3s16 camera_offset, std::vector<SelectedNode> &select);
class SelectionMesh class SelectionMesh
{ {