Skip to content

Commit

Permalink
Revert "Remove workaround in itemdef.cpp to enable/disable/enable "en…
Browse files Browse the repository at this point in the history
…able_shaders" setting"

This reverts commit d25ff8f.
  • Loading branch information
Zeno- committed Feb 11, 2015
1 parent d25ff8f commit f824866
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 13 deletions.
3 changes: 1 addition & 2 deletions src/client.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@ Client::Client(
}

m_cache_smooth_lighting = g_settings->getBool("smooth_lighting");
m_cache_enable_shaders = g_settings->getBool("enable_shaders");
}

void Client::Stop()
Expand Down Expand Up @@ -2682,7 +2681,7 @@ void Client::addUpdateMeshTask(v3s16 p, bool ack_to_server, bool urgent)
Create a task to update the mesh of the block
*/

MeshMakeData *data = new MeshMakeData(this, m_cache_enable_shaders);
MeshMakeData *data = new MeshMakeData(this);

{
//TimeTaker timer("data fill");
Expand Down
3 changes: 1 addition & 2 deletions src/client.h
Original file line number Diff line number Diff line change
Expand Up @@ -623,9 +623,8 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
Database *localdb;
Server *localserver;

// TODO: Add callback to update these when g_settings changes
// TODO: Add callback to update this when g_settings changes
bool m_cache_smooth_lighting;
bool m_cache_enable_shaders;
};

#endif // !CLIENT_HEADER
11 changes: 10 additions & 1 deletion src/itemdef.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,8 @@ class CItemDefManager: public IWritableItemDefManager

scene::IMesh *node_mesh = NULL;

bool reenable_shaders = false;

if (need_rtt_mesh || need_wield_mesh) {
u8 param1 = 0;
if (f.param_type == CPT_LIGHT)
Expand All @@ -370,7 +372,11 @@ class CItemDefManager: public IWritableItemDefManager
/*
Make a mesh from the node
*/
MeshMakeData mesh_make_data(gamedef, false);
if (g_settings->getBool("enable_shaders")) {
reenable_shaders = true;
g_settings->setBool("enable_shaders", false);
}
MeshMakeData mesh_make_data(gamedef);
u8 param2 = 0;
if (f.param_type_2 == CPT2_WALLMOUNTED)
param2 = 1;
Expand Down Expand Up @@ -437,6 +443,9 @@ class CItemDefManager: public IWritableItemDefManager

if (node_mesh)
node_mesh->drop();

if (reenable_shaders)
g_settings->setBool("enable_shaders",true);
}

// Put in cache
Expand Down
5 changes: 2 additions & 3 deletions src/mapblock_mesh.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,15 @@ static void applyFacesShading(video::SColor& color, float factor)
MeshMakeData
*/

MeshMakeData::MeshMakeData(IGameDef *gamedef, bool use_shaders):
MeshMakeData::MeshMakeData(IGameDef *gamedef):
m_vmanip(),
m_blockpos(-1337,-1337,-1337),
m_crack_pos_relative(-1337, -1337, -1337),
m_highlighted_pos_relative(-1337, -1337, -1337),
m_smooth_lighting(false),
m_show_hud(false),
m_highlight_mesh_color(255, 255, 255, 255),
m_gamedef(gamedef),
m_use_shaders(use_shaders)
m_gamedef(gamedef)
{}

void MeshMakeData::fill(MapBlock *block)
Expand Down
3 changes: 1 addition & 2 deletions src/mapblock_mesh.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,8 @@ struct MeshMakeData
video::SColor m_highlight_mesh_color;

IGameDef *m_gamedef;
bool m_use_shaders;

MeshMakeData(IGameDef *gamedef, bool use_shaders);
MeshMakeData(IGameDef *gamedef);

/*
Copy central data directly from block, and other data from
Expand Down
4 changes: 1 addition & 3 deletions src/wieldmesh.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -340,9 +340,7 @@ void WieldMeshSceneNode::setItem(const ItemStack &item, IGameDef *gamedef)
} else if (f.drawtype == NDT_NORMAL || f.drawtype == NDT_ALLFACES) {
setCube(f.tiles, def.wield_scale, tsrc);
} else {
//// TODO: Change false in the following constructor args to
//// appropriate value when shader is added for wield items (if applicable)
MeshMakeData mesh_make_data(gamedef, false);
MeshMakeData mesh_make_data(gamedef);
MapNode mesh_make_node(id, 255, 0);
mesh_make_data.fillSingleNode(&mesh_make_node);
MapBlockMesh mapblock_mesh(&mesh_make_data, v3s16(0, 0, 0));
Expand Down

0 comments on commit f824866

Please sign in to comment.