minetest-stuffs/dragonfire-client-dragonfire
1
0
Fork 0
Code Issues 10 Pull Requests 2 Packages Projects Releases 3 Wiki Activity

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

Browse Source 
This reverts commit a555e2d9b0.
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
Download Patch File Download Diff File Expand all files Collapse all files

6
src/settings.h
View File

@@ -32,7 +32,7 @@ class Settings;
struct NoiseParams;
/** 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 {
VALUETYPE_STRING,
@@ -204,7 +204,7 @@ public:
void clear();
void updateValue(const Settings &other, const std::string &name);
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:
@@ -215,7 +215,7 @@ private:
std::map<std::string, SettingsEntry> m_settings;
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.
mutable JMutex m_mutex;
};