BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Revert "Make the GameGlobalShaderConstantSetter use the settings callback (8% perf improvement in game loop)"

Browse Source 
This reverts commit a555e2d9b0ccee452996381a44677b8bec210036.
This commit is contained in:
Craig Robbins 2015-01-25 01:19:40 +10:00
parent 800d192702
commit 2c4a5e1861
4 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fontengine.cpp
View File

@ -36,7 +36,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
FontEngine* g_fontengine = NULL; FontEngine* g_fontengine = NULL;
/** callback to be used on change of font size setting */ /** callback to be used on change of font size setting */
static void font_setting_changed(const std::string, void *userdata) { static void font_setting_changed(const std::string) {
g_fontengine->readSettings(); g_fontengine->readSettings();
} }

20
src/game.cpp
View File

@ -809,31 +809,15 @@ class GameGlobalShaderConstantSetter : public IShaderConstantSetter
bool *m_force_fog_off; bool *m_force_fog_off;
f32 *m_fog_range; f32 *m_fog_range;
Client *m_client; Client *m_client;
bool m_fogEnabled;
public: public:
void onSettingsChange(const std::string &name)
{
if (name == "enable_fog")
m_fogEnabled = g_settings->getBool("enable_fog");
}
static void SettingsCallback(const std::string name, void *userdata)
{
reinterpret_cast<GameGlobalShaderConstantSetter*>(userdata)->onSettingsChange(name);
}
GameGlobalShaderConstantSetter(Sky *sky, bool *force_fog_off, GameGlobalShaderConstantSetter(Sky *sky, bool *force_fog_off,
f32 *fog_range, Client *client) : f32 *fog_range, Client *client) :
m_sky(sky), m_sky(sky),
m_force_fog_off(force_fog_off), m_force_fog_off(force_fog_off),
m_fog_range(fog_range), m_fog_range(fog_range),
m_client(client) m_client(client)
{ {}
g_settings->registerChangedCallback("enable_fog", SettingsCallback, this);
}
~GameGlobalShaderConstantSetter() {} ~GameGlobalShaderConstantSetter() {}
virtual void onSetConstants(video::IMaterialRendererServices *services, virtual void onSetConstants(video::IMaterialRendererServices *services,
@ -856,7 +840,7 @@ public:
// Fog distance // Fog distance
float fog_distance = 10000 * BS; float fog_distance = 10000 * BS;
if (m_fogEnabled && !*m_force_fog_off) if (g_settings->getBool("enable_fog") && !*m_force_fog_off)
fog_distance = *m_fog_range; fog_distance = *m_fog_range;
services->setPixelShaderConstant("fogDistance", &fog_distance, 1); services->setPixelShaderConstant("fogDistance", &fog_distance, 1);

10
src/settings.cpp
View File

@ -965,15 +965,15 @@ void Settings::clearNoLock()
void Settings::registerChangedCallback(std::string name, void Settings::registerChangedCallback(std::string name,
setting_changed_callback cbf, void *userdata) setting_changed_callback cbf)
{ {
m_callbacks[name].push_back(std::make_pair(cbf,userdata)); m_callbacks[name].push_back(cbf);
} }
void Settings::doCallbacks(const std::string name) void Settings::doCallbacks(const std::string name)
{ {
std::vector<std::pair<setting_changed_callback,void*> > tempvector; std::vector<setting_changed_callback> tempvector;
{ {
JMutexAutoLock lock(m_mutex); JMutexAutoLock lock(m_mutex);
if (m_callbacks.find(name) != m_callbacks.end()) if (m_callbacks.find(name) != m_callbacks.end())
@ -982,9 +982,9 @@ void Settings::doCallbacks(const std::string name)
} }
} }
std::vector<std::pair<setting_changed_callback, void*> >::iterator iter; std::vector<setting_changed_callback>::iterator iter;
for (iter = tempvector.begin(); iter != tempvector.end(); iter++) for (iter = tempvector.begin(); iter != tempvector.end(); iter++)
{ {
(iter->first)(name,iter->second); (*iter)(name);
} }
} }

6
src/settings.h
View File

@ -32,7 +32,7 @@ class Settings;
struct NoiseParams; struct NoiseParams;
/** function type to register a changed callback */ /** function type to register a changed callback */
typedef void (*setting_changed_callback)(const std::string, void *userdata); typedef void (*setting_changed_callback)(const std::string);
enum ValueType { enum ValueType {
VALUETYPE_STRING, VALUETYPE_STRING,
@ -204,7 +204,7 @@ public:
void clear(); void clear();
void updateValue(const Settings &other, const std::string &name); void updateValue(const Settings &other, const std::string &name);
void update(const Settings &other); void update(const Settings &other);
void registerChangedCallback(std::string name, setting_changed_callback cbf, void *userdata = NULL); void registerChangedCallback(std::string name, setting_changed_callback cbf);
private: private:
@ -215,7 +215,7 @@ private:
std::map<std::string, SettingsEntry> m_settings; std::map<std::string, SettingsEntry> m_settings;
std::map<std::string, SettingsEntry> m_defaults; std::map<std::string, SettingsEntry> m_defaults;
std::map<std::string, std::vector<std::pair<setting_changed_callback,void*> > > m_callbacks; std::map<std::string, std::vector<setting_changed_callback> > m_callbacks;
// All methods that access m_settings/m_defaults directly should lock this. // All methods that access m_settings/m_defaults directly should lock this.
mutable JMutex m_mutex; mutable JMutex m_mutex;
}; };