aboutsummaryrefslogtreecommitdiff
path: root/src/util
diff options
context:
space:
mode:
Diffstat (limited to 'src/util')
-rw-r--r--src/util/CMakeLists.txt2
-rw-r--r--src/util/areastore.cpp38
-rw-r--r--src/util/areastore.h12
-rw-r--r--src/util/hex.h2
-rw-r--r--src/util/quicktune.cpp104
-rw-r--r--src/util/quicktune.h98
-rw-r--r--src/util/quicktune_shortcutter.h84
7 files changed, 329 insertions, 11 deletions
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index bf208693b..199d3aeaa 100644
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -7,6 +7,7 @@ set(UTIL_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/ieee_float.cpp
${CMAKE_CURRENT_SOURCE_DIR}/numeric.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pointedthing.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/quicktune.cpp
${CMAKE_CURRENT_SOURCE_DIR}/serialize.cpp
${CMAKE_CURRENT_SOURCE_DIR}/sha1.cpp
${CMAKE_CURRENT_SOURCE_DIR}/sha256.c
@@ -14,4 +15,3 @@ set(UTIL_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/srp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/timetaker.cpp
PARENT_SCOPE)
-
diff --git a/src/util/areastore.cpp b/src/util/areastore.cpp
index 50d237bba..cea526336 100644
--- a/src/util/areastore.cpp
+++ b/src/util/areastore.cpp
@@ -64,6 +64,11 @@ const Area *AreaStore::getArea(u32 id) const
void AreaStore::serialize(std::ostream &os) const
{
+ // WARNING:
+ // Before 5.1.0-dev: version != 0 throws SerializationError
+ // After 5.1.0-dev: version >= 5 throws SerializationError
+ // Forwards-compatibility is assumed before version 5.
+
writeU8(os, 0); // Serialisation version
// TODO: Compression?
@@ -75,27 +80,41 @@ void AreaStore::serialize(std::ostream &os) const
writeU16(os, a.data.size());
os.write(a.data.data(), a.data.size());
}
+
+ // Serialize IDs
+ for (const auto &it : areas_map)
+ writeU32(os, it.second.id);
}
void AreaStore::deserialize(std::istream &is)
{
u8 ver = readU8(is);
- if (ver != 0)
+ // Assume forwards-compatibility before version 5
+ if (ver >= 5)
throw SerializationError("Unknown AreaStore "
"serialization version!");
u16 num_areas = readU16(is);
+ std::vector<Area> areas;
for (u32 i = 0; i < num_areas; ++i) {
- Area a;
+ Area a(U32_MAX);
a.minedge = readV3S16(is);
a.maxedge = readV3S16(is);
u16 data_len = readU16(is);
char *data = new char[data_len];
is.read(data, data_len);
a.data = std::string(data, data_len);
- insertArea(&a);
+ areas.emplace_back(a);
delete [] data;
}
+
+ bool read_ids = is.good(); // EOF for old formats
+
+ for (auto &area : areas) {
+ if (read_ids)
+ area.id = readU32(is);
+ insertArea(&area);
+ }
}
void AreaStore::invalidateCache()
@@ -105,6 +124,19 @@ void AreaStore::invalidateCache()
}
}
+u32 AreaStore::getNextId() const
+{
+ u32 free_id = 0;
+ for (const auto &area : areas_map) {
+ if (area.first > free_id)
+ return free_id; // Found gap
+
+ free_id = area.first + 1;
+ }
+ // End of map
+ return free_id;
+}
+
void AreaStore::setCacheParams(bool enabled, u8 block_radius, size_t limit)
{
m_cache_enabled = enabled;
diff --git a/src/util/areastore.h b/src/util/areastore.h
index 24840210e..150a043db 100644
--- a/src/util/areastore.h
+++ b/src/util/areastore.h
@@ -37,15 +37,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
struct Area {
- Area() = default;
+ Area(u32 area_id) : id(area_id) {}
- Area(const v3s16 &mine, const v3s16 &maxe) :
- minedge(mine), maxedge(maxe)
+ Area(const v3s16 &mine, const v3s16 &maxe, u32 area_id = U32_MAX) :
+ id(area_id), minedge(mine), maxedge(maxe)
{
sortBoxVerticies(minedge, maxedge);
}
- u32 id = U32_MAX;
+ u32 id;
v3s16 minedge, maxedge;
std::string data;
};
@@ -109,7 +109,7 @@ protected:
virtual void getAreasForPosImpl(std::vector<Area *> *result, v3s16 pos) = 0;
/// Returns the next area ID and increments it.
- u32 getNextId() { return m_next_id++; }
+ u32 getNextId() const;
// Note: This can't be an unordered_map, since all
// references would be invalidated on rehash.
@@ -125,8 +125,6 @@ private:
/// If you modify this, call invalidateCache()
u8 m_cacheblock_radius = 64;
LRUCache<v3s16, std::vector<Area *> > m_res_cache;
-
- u32 m_next_id = 0;
};
diff --git a/src/util/hex.h b/src/util/hex.h
index df22539a5..708f33024 100644
--- a/src/util/hex.h
+++ b/src/util/hex.h
@@ -26,6 +26,8 @@ static const char hex_chars[] = "0123456789abcdef";
static inline std::string hex_encode(const char *data, unsigned int data_size)
{
std::string ret;
+ ret.reserve(data_size * 2);
+
char buf2[3];
buf2[2] = '\0';
diff --git a/src/util/quicktune.cpp b/src/util/quicktune.cpp
new file mode 100644
index 000000000..37d4933de
--- /dev/null
+++ b/src/util/quicktune.cpp
@@ -0,0 +1,104 @@
+/*
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "quicktune.h"
+#include "threading/mutex_auto_lock.h"
+#include "util/string.h"
+
+std::string QuicktuneValue::getString()
+{
+ switch(type){
+ case QVT_NONE:
+ return "(none)";
+ case QVT_FLOAT:
+ return ftos(value_QVT_FLOAT.current);
+ }
+ return "<invalid type>";
+}
+void QuicktuneValue::relativeAdd(float amount)
+{
+ switch(type){
+ case QVT_NONE:
+ break;
+ case QVT_FLOAT:
+ value_QVT_FLOAT.current += amount * (value_QVT_FLOAT.max - value_QVT_FLOAT.min);
+ if(value_QVT_FLOAT.current > value_QVT_FLOAT.max)
+ value_QVT_FLOAT.current = value_QVT_FLOAT.max;
+ if(value_QVT_FLOAT.current < value_QVT_FLOAT.min)
+ value_QVT_FLOAT.current = value_QVT_FLOAT.min;
+ break;
+ }
+}
+
+static std::map<std::string, QuicktuneValue> g_values;
+static std::vector<std::string> g_names;
+std::mutex *g_mutex = NULL;
+
+static void makeMutex()
+{
+ if(!g_mutex){
+ g_mutex = new std::mutex();
+ }
+}
+
+std::vector<std::string> getQuicktuneNames()
+{
+ return g_names;
+}
+
+QuicktuneValue getQuicktuneValue(const std::string &name)
+{
+ makeMutex();
+ MutexAutoLock lock(*g_mutex);
+ std::map<std::string, QuicktuneValue>::iterator i = g_values.find(name);
+ if(i == g_values.end()){
+ QuicktuneValue val;
+ val.type = QVT_NONE;
+ return val;
+ }
+ return i->second;
+}
+
+void setQuicktuneValue(const std::string &name, const QuicktuneValue &val)
+{
+ makeMutex();
+ MutexAutoLock lock(*g_mutex);
+ g_values[name] = val;
+ g_values[name].modified = true;
+}
+
+void updateQuicktuneValue(const std::string &name, QuicktuneValue &val)
+{
+ makeMutex();
+ MutexAutoLock lock(*g_mutex);
+ std::map<std::string, QuicktuneValue>::iterator i = g_values.find(name);
+ if(i == g_values.end()){
+ g_values[name] = val;
+ g_names.push_back(name);
+ return;
+ }
+ QuicktuneValue &ref = i->second;
+ if(ref.modified)
+ val = ref;
+ else{
+ ref = val;
+ ref.modified = false;
+ }
+}
+
diff --git a/src/util/quicktune.h b/src/util/quicktune.h
new file mode 100644
index 000000000..1943d19c2
--- /dev/null
+++ b/src/util/quicktune.h
@@ -0,0 +1,98 @@
+/*
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+/*
+ Used for tuning constants when developing.
+
+ Eg. if you have this constant somewhere that you just can't get right
+ by changing it and recompiling all over again:
+ v3f wield_position = v3f(55, -35, 65);
+
+ Make it look like this:
+ v3f wield_position = v3f(55, -35, 65);
+ QUICKTUNE_AUTONAME(QVT_FLOAT, wield_position.X, 0, 100);
+ QUICKTUNE_AUTONAME(QVT_FLOAT, wield_position.Y, -80, 20);
+ QUICKTUNE_AUTONAME(QVT_FLOAT, wield_position.Z, 0, 100);
+
+ Then you can modify the values at runtime, using the keys
+ keymap_quicktune_prev
+ keymap_quicktune_next
+ keymap_quicktune_dec
+ keymap_quicktune_inc
+
+ Once you have modified the values at runtime and then quit, the game
+ will print out all the modified values at the end:
+ Modified quicktune values:
+ wield_position.X = 60
+ wield_position.Y = -30
+ wield_position.Z = 65
+
+ The QUICKTUNE macros shouldn't generally be left in committed code.
+*/
+
+#pragma once
+
+#include <string>
+#include <map>
+#include <vector>
+
+enum QuicktuneValueType{
+ QVT_NONE,
+ QVT_FLOAT
+};
+struct QuicktuneValue
+{
+ QuicktuneValueType type = QVT_NONE;
+ union{
+ struct{
+ float current;
+ float min;
+ float max;
+ } value_QVT_FLOAT;
+ };
+ bool modified = false;
+
+ QuicktuneValue() = default;
+
+ std::string getString();
+ void relativeAdd(float amount);
+};
+
+std::vector<std::string> getQuicktuneNames();
+QuicktuneValue getQuicktuneValue(const std::string &name);
+void setQuicktuneValue(const std::string &name, const QuicktuneValue &val);
+
+void updateQuicktuneValue(const std::string &name, QuicktuneValue &val);
+
+#ifndef NDEBUG
+ #define QUICKTUNE(type_, var, min_, max_, name){\
+ QuicktuneValue qv;\
+ qv.type = type_;\
+ qv.value_##type_.current = var;\
+ qv.value_##type_.min = min_;\
+ qv.value_##type_.max = max_;\
+ updateQuicktuneValue(name, qv);\
+ var = qv.value_##type_.current;\
+ }
+#else // NDEBUG
+ #define QUICKTUNE(type, var, min_, max_, name){}
+#endif
+
+#define QUICKTUNE_AUTONAME(type_, var, min_, max_)\
+ QUICKTUNE(type_, var, min_, max_, #var)
diff --git a/src/util/quicktune_shortcutter.h b/src/util/quicktune_shortcutter.h
new file mode 100644
index 000000000..70a7b70b3
--- /dev/null
+++ b/src/util/quicktune_shortcutter.h
@@ -0,0 +1,84 @@
+/*
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#pragma once
+
+#include "quicktune.h"
+
+class QuicktuneShortcutter
+{
+private:
+ std::vector<std::string> m_names;
+ u32 m_selected_i;
+ std::string m_message;
+public:
+ bool hasMessage() const
+ {
+ return !m_message.empty();
+ }
+
+ std::string getMessage()
+ {
+ std::string s = m_message;
+ m_message = "";
+ if (!s.empty())
+ return std::string("[quicktune] ") + s;
+ return "";
+ }
+ std::string getSelectedName()
+ {
+ if(m_selected_i < m_names.size())
+ return m_names[m_selected_i];
+ return "(nothing)";
+ }
+ void next()
+ {
+ m_names = getQuicktuneNames();
+ if(m_selected_i < m_names.size()-1)
+ m_selected_i++;
+ else
+ m_selected_i = 0;
+ m_message = std::string("Selected \"")+getSelectedName()+"\"";
+ }
+ void prev()
+ {
+ m_names = getQuicktuneNames();
+ if(m_selected_i > 0)
+ m_selected_i--;
+ else
+ m_selected_i = m_names.size()-1;
+ m_message = std::string("Selected \"")+getSelectedName()+"\"";
+ }
+ void inc()
+ {
+ QuicktuneValue val = getQuicktuneValue(getSelectedName());
+ val.relativeAdd(0.05);
+ m_message = std::string("\"")+getSelectedName()
+ +"\" = "+val.getString();
+ setQuicktuneValue(getSelectedName(), val);
+ }
+ void dec()
+ {
+ QuicktuneValue val = getQuicktuneValue(getSelectedName());
+ val.relativeAdd(-0.05);
+ m_message = std::string("\"")+getSelectedName()
+ +"\" = "+val.getString();
+ setQuicktuneValue(getSelectedName(), val);
+ }
+};
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-14 07:39:09 +0000