X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Futility.h;h=aa64c28bb601ceb3be158917d939c461c60a89ed;hb=2b200d481fd919752bdb786142e5eb41c3932537;hp=f7e726f87b389418420e5b7714197a40543b9cd5;hpb=385dd9917fd4ced23a704f0566779d58f5a6b727;p=dragonfireclient.git diff --git a/src/utility.h b/src/utility.h index f7e726f87..aa64c28bb 100644 --- a/src/utility.h +++ b/src/utility.h @@ -17,10 +17,6 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* -(c) 2010 Perttu Ahola -*/ - #ifndef UTILITY_HEADER #define UTILITY_HEADER @@ -28,16 +24,37 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #include #include +#include +#include #include #include +#include #include "common_irrlicht.h" #include "debug.h" -#include "strfnd.h" #include "exceptions.h" +#include "porting.h" +#include "strfnd.h" // For trim() + +extern const v3s16 g_6dirs[6]; extern const v3s16 g_26dirs[26]; +// 26th is (0,0,0) +extern const v3s16 g_27dirs[27]; + +inline void writeU64(u8 *data, u64 i) +{ + data[0] = ((i>>56)&0xff); + data[1] = ((i>>48)&0xff); + data[2] = ((i>>40)&0xff); + data[3] = ((i>>32)&0xff); + data[4] = ((i>>24)&0xff); + data[5] = ((i>>16)&0xff); + data[6] = ((i>> 8)&0xff); + data[7] = ((i>> 0)&0xff); +} + inline void writeU32(u8 *data, u32 i) { data[0] = ((i>>24)&0xff); @@ -57,6 +74,14 @@ inline void writeU8(u8 *data, u8 i) data[0] = ((i>> 0)&0xff); } +inline u64 readU64(u8 *data) +{ + return ((u64)data[0]<<56) | ((u64)data[1]<<48) + | ((u64)data[2]<<40) | ((u64)data[3]<<32) + | ((u64)data[4]<<24) | ((u64)data[5]<<16) + | ((u64)data[6]<<8) | ((u64)data[7]<<0); +} + inline u32 readU32(u8 *data) { return (data[0]<<24) | (data[1]<<16) | (data[2]<<8) | (data[3]<<0); @@ -72,8 +97,6 @@ inline u8 readU8(u8 *data) return (data[0]<<0); } -// Signed variants of the above - inline void writeS32(u8 *data, s32 i){ writeU32(data, (u32)i); } @@ -88,13 +111,26 @@ inline s16 readS16(u8 *data){ return (s16)readU16(data); } +inline void writeS8(u8 *data, s8 i){ + writeU8(data, (u8)i); +} +inline s8 readS8(u8 *data){ + return (s8)readU8(data); +} + +inline void writeF1000(u8 *data, f32 i){ + writeS32(data, i*1000); +} +inline f32 readF1000(u8 *data){ + return (f32)readS32(data)/1000.; +} + inline void writeV3S32(u8 *data, v3s32 p) { writeS32(&data[0], p.X); writeS32(&data[4], p.Y); writeS32(&data[8], p.Z); } - inline v3s32 readV3S32(u8 *data) { v3s32 p; @@ -104,6 +140,34 @@ inline v3s32 readV3S32(u8 *data) return p; } +inline void writeV3F1000(u8 *data, v3f p) +{ + writeF1000(&data[0], p.X); + writeF1000(&data[4], p.Y); + writeF1000(&data[8], p.Z); +} +inline v3f readV3F1000(u8 *data) +{ + v3f p; + p.X = (float)readF1000(&data[0]); + p.Y = (float)readF1000(&data[4]); + p.Z = (float)readF1000(&data[8]); + return p; +} + +inline void writeV2F1000(u8 *data, v2f p) +{ + writeF1000(&data[0], p.X); + writeF1000(&data[4], p.Y); +} +inline v2f readV2F1000(u8 *data) +{ + v2f p; + p.X = (float)readF1000(&data[0]); + p.Y = (float)readF1000(&data[4]); + return p; +} + inline void writeV2S16(u8 *data, v2s16 p) { writeS16(&data[0], p.X); @@ -148,6 +212,153 @@ inline v3s16 readV3S16(u8 *data) return p; } +/* + The above stuff directly interfaced to iostream +*/ + +inline void writeU8(std::ostream &os, u8 p) +{ + char buf[1]; + writeU8((u8*)buf, p); + os.write(buf, 1); +} +inline u8 readU8(std::istream &is) +{ + char buf[1]; + is.read(buf, 1); + return readU8((u8*)buf); +} + +inline void writeU16(std::ostream &os, u16 p) +{ + char buf[2]; + writeU16((u8*)buf, p); + os.write(buf, 2); +} +inline u16 readU16(std::istream &is) +{ + char buf[2]; + is.read(buf, 2); + return readU16((u8*)buf); +} + +inline void writeU32(std::ostream &os, u32 p) +{ + char buf[4]; + writeU32((u8*)buf, p); + os.write(buf, 4); +} +inline u32 readU32(std::istream &is) +{ + char buf[4]; + is.read(buf, 4); + return readU32((u8*)buf); +} + +inline void writeS32(std::ostream &os, s32 p) +{ + char buf[4]; + writeS32((u8*)buf, p); + os.write(buf, 4); +} +inline s32 readS32(std::istream &is) +{ + char buf[4]; + is.read(buf, 4); + return readS32((u8*)buf); +} + +inline void writeS16(std::ostream &os, s16 p) +{ + char buf[2]; + writeS16((u8*)buf, p); + os.write(buf, 2); +} +inline s16 readS16(std::istream &is) +{ + char buf[2]; + is.read(buf, 2); + return readS16((u8*)buf); +} + +inline void writeS8(std::ostream &os, s8 p) +{ + char buf[1]; + writeS8((u8*)buf, p); + os.write(buf, 1); +} +inline s8 readS8(std::istream &is) +{ + char buf[1]; + is.read(buf, 1); + return readS8((u8*)buf); +} + +inline void writeF1000(std::ostream &os, f32 p) +{ + char buf[4]; + writeF1000((u8*)buf, p); + os.write(buf, 4); +} +inline f32 readF1000(std::istream &is) +{ + char buf[4]; + is.read(buf, 4); + return readF1000((u8*)buf); +} + +inline void writeV3F1000(std::ostream &os, v3f p) +{ + char buf[12]; + writeV3F1000((u8*)buf, p); + os.write(buf, 12); +} +inline v3f readV3F1000(std::istream &is) +{ + char buf[12]; + is.read(buf, 12); + return readV3F1000((u8*)buf); +} + +inline void writeV2F1000(std::ostream &os, v2f p) +{ + char buf[8]; + writeV2F1000((u8*)buf, p); + os.write(buf, 8); +} +inline v2f readV2F1000(std::istream &is) +{ + char buf[8]; + is.read(buf, 8); + return readV2F1000((u8*)buf); +} + +inline void writeV2S16(std::ostream &os, v2s16 p) +{ + char buf[4]; + writeV2S16((u8*)buf, p); + os.write(buf, 4); +} +inline v2s16 readV2S16(std::istream &is) +{ + char buf[4]; + is.read(buf, 4); + return readV2S16((u8*)buf); +} + +inline void writeV3S16(std::ostream &os, v3s16 p) +{ + char buf[6]; + writeV3S16((u8*)buf, p); + os.write(buf, 6); +} +inline v3s16 readV3S16(std::istream &is) +{ + char buf[6]; + is.read(buf, 6); + return readV3S16((u8*)buf); +} + /* None of these are used at the moment */ @@ -206,6 +417,10 @@ class SharedPtr { return ptr == t; } + T & operator[](unsigned int i) + { + return ptr[i]; + } private: void drop() { @@ -226,26 +441,59 @@ template class Buffer { public: + Buffer() + { + m_size = 0; + data = NULL; + } Buffer(unsigned int size) { m_size = size; - data = new T[size]; + if(size != 0) + data = new T[size]; + else + data = NULL; } Buffer(const Buffer &buffer) { m_size = buffer.m_size; - data = new T[buffer.m_size]; - memcpy(data, buffer.data, buffer.m_size); + if(m_size != 0) + { + data = new T[buffer.m_size]; + memcpy(data, buffer.data, buffer.m_size); + } + else + data = NULL; } - Buffer(T *t, unsigned int size) + Buffer(const T *t, unsigned int size) { m_size = size; - data = new T[size]; - memcpy(data, t, size); + if(size != 0) + { + data = new T[size]; + memcpy(data, t, size); + } + else + data = NULL; } ~Buffer() { - delete[] data; + drop(); + } + Buffer& operator=(const Buffer &buffer) + { + if(this == &buffer) + return *this; + drop(); + m_size = buffer.m_size; + if(m_size != 0) + { + data = new T[buffer.m_size]; + memcpy(data, buffer.data, buffer.m_size); + } + else + data = NULL; + return *this; } T & operator[](unsigned int i) const { @@ -260,6 +508,11 @@ class Buffer return m_size; } private: + void drop() + { + if(data) + delete[] data; + } T *data; unsigned int m_size; }; @@ -268,10 +521,20 @@ template class SharedBuffer { public: + SharedBuffer() + { + m_size = 0; + data = NULL; + refcount = new unsigned int; + (*refcount) = 1; + } SharedBuffer(unsigned int size) { m_size = size; - data = new T[size]; + if(m_size != 0) + data = new T[m_size]; + else + data = NULL; refcount = new unsigned int; (*refcount) = 1; } @@ -301,8 +564,13 @@ class SharedBuffer SharedBuffer(T *t, unsigned int size) { m_size = size; - data = new T[size]; - memcpy(data, t, size); + if(m_size != 0) + { + data = new T[m_size]; + memcpy(data, t, m_size); + } + else + data = NULL; refcount = new unsigned int; (*refcount) = 1; } @@ -311,9 +579,14 @@ class SharedBuffer */ SharedBuffer(const Buffer &buffer) { - m_size = buffer.m_size; - data = new T[buffer.getSize()]; - memcpy(data, *buffer, buffer.getSize()); + m_size = buffer.getSize(); + if(m_size != 0) + { + data = new T[m_size]; + memcpy(data, *buffer, buffer.getSize()); + } + else + data = NULL; refcount = new unsigned int; (*refcount) = 1; } @@ -323,6 +596,7 @@ class SharedBuffer } T & operator[](unsigned int i) const { + //assert(i < m_size) return data[i]; } T * operator*() const @@ -333,6 +607,10 @@ class SharedBuffer { return m_size; } + operator Buffer() const + { + return Buffer(data, m_size); + } private: void drop() { @@ -340,7 +618,8 @@ class SharedBuffer (*refcount)--; if(*refcount == 0) { - delete[] data; + if(data) + delete[] data; delete refcount; } } @@ -397,58 +676,64 @@ class MutexedVariable class TimeTaker { public: - TimeTaker(const char *name, IrrlichtDevice *dev, u32 *result=NULL) - { - m_name = name; - m_dev = dev; - m_result = result; - m_running = true; - if(dev == NULL) - { - m_time1 = 0; - return; - } - m_time1 = m_dev->getTimer()->getRealTime(); - } + TimeTaker(const char *name, u32 *result=NULL); + ~TimeTaker() { stop(); } - u32 stop(bool quiet=false) - { - if(m_running) - { - if(m_dev == NULL) - { - /*if(quiet == false) - std::cout<<"Couldn't measure time for "<getTimer()->getRealTime(); - u32 dtime = time2 - m_time1; - if(m_result != NULL) - { - (*m_result) += dtime; - } - else - { - if(quiet == false) - std::cout< &list, u16 d) { @@ -569,6 +854,23 @@ inline v3s16 getContainerPos(v3s16 p, s16 d) ); } +inline v2s16 getContainerPos(v2s16 p, v2s16 d) +{ + return v2s16( + getContainerPos(p.X, d.X), + getContainerPos(p.Y, d.Y) + ); +} + +inline v3s16 getContainerPos(v3s16 p, v3s16 d) +{ + return v3s16( + getContainerPos(p.X, d.X), + getContainerPos(p.Y, d.Y), + getContainerPos(p.Z, d.Z) + ); +} + inline bool isInArea(v3s16 p, s16 d) { return ( @@ -586,11 +888,50 @@ inline bool isInArea(v2s16 p, s16 d) ); } +inline bool isInArea(v3s16 p, v3s16 d) +{ + return ( + p.X >= 0 && p.X < d.X && + p.Y >= 0 && p.Y < d.Y && + p.Z >= 0 && p.Z < d.Z + ); +} + +inline s16 rangelim(s16 i, s16 max) +{ + if(i < 0) + return 0; + if(i > max) + return max; + return i; +} + +#define rangelim(d, min, max) ((d) < (min) ? (min) : ((d)>(max)?(max):(d))) + +inline v3s16 arealim(v3s16 p, s16 d) +{ + if(p.X < 0) + p.X = 0; + if(p.Y < 0) + p.Y = 0; + if(p.Z < 0) + p.Z = 0; + if(p.X > d-1) + p.X = d-1; + if(p.Y > d-1) + p.Y = d-1; + if(p.Z > d-1) + p.Z = d-1; + return p; +} + inline std::wstring narrow_to_wide(const std::string& mbs) { size_t wcl = mbs.size(); - SharedBuffer wcs(wcl+1); + Buffer wcs(wcl+1); size_t l = mbstowcs(*wcs, mbs.c_str(), wcl); + if(l == (size_t)(-1)) + return L""; wcs[l] = 0; return *wcs; } @@ -600,13 +941,26 @@ inline std::string wide_to_narrow(const std::wstring& wcs) size_t mbl = wcs.size()*4; SharedBuffer mbs(mbl+1); size_t l = wcstombs(*mbs, wcs.c_str(), mbl); - if((int)l == -1) + if(l == (size_t)(-1)) mbs[0] = 0; else mbs[l] = 0; return *mbs; } +// Split a string using the given delimiter. Returns a vector containing +// the component parts. +inline std::vector str_split(const std::wstring &str, wchar_t delimiter) +{ + std::vector parts; + std::wstringstream sstr(str); + std::wstring part; + while(std::getline(sstr, part, delimiter)) + parts.push_back(part); + return parts; +} + + /* See test.cpp for example cases. wraps degrees to the range of -360...360 @@ -631,25 +985,57 @@ inline float wrapDegrees(float f) return f; } -inline std::string lowercase(std::string s) +/* Wrap to 0...360 */ +inline float wrapDegrees_0_360(float f) +{ + // Take examples of f=10, f=720.5, f=-0.5, f=-360.5 + // This results in + // 10, 720, -1, -361 + int i = floor(f); + // 0, 2, 0, -1 + int l = i / 360; + // Wrap to 0...360 + // 0, 2, -1, -2 + if(i < 0) + l -= 1; + // 0, 720, 0, -360 + int k = l * 360; + // 10, 0.5, -0.5, -0.5 + f -= float(k); + return f; +} + +/* Wrap to -180...180 */ +inline float wrapDegrees_180(float f) { + f += 180; + f = wrapDegrees_0_360(f); + f -= 180; + return f; +} + +inline std::string lowercase(const std::string &s) +{ + std::string s2; for(size_t i=0; i= 'A' && s[i] <= 'Z') - s[i] -= 'A' - 'a'; + char c = s[i]; + if(c >= 'A' && c <= 'Z') + c -= 'A' - 'a'; + s2 += c; } - return s; + return s2; } -inline bool is_yes(std::string s) +inline bool is_yes(const std::string &s) { - s = lowercase(trim(s)); - if(s == "y" || s == "yes" || s == "true") + std::string s2 = lowercase(trim(s)); + if(s2 == "y" || s2 == "yes" || s2 == "true" || s2 == "1") return true; return false; } -inline s32 stoi(std::string s, s32 min, s32 max) +inline s32 mystoi(const std::string &s, s32 min, s32 max) { s32 i = atoi(s.c_str()); if(i < min) @@ -659,445 +1045,833 @@ inline s32 stoi(std::string s, s32 min, s32 max) return i; } -inline s32 stoi(std::string s) + +// MSVC2010 includes it's own versions of these +//#if !defined(_MSC_VER) || _MSC_VER < 1600 + +inline s32 mystoi(std::string s) { return atoi(s.c_str()); } -/* - Config stuff -*/ +inline s32 mystoi(std::wstring s) +{ + return atoi(wide_to_narrow(s).c_str()); +} -enum ValueType +inline float mystof(std::string s) { - VALUETYPE_STRING, - VALUETYPE_FLAG // Doesn't take any arguments -}; + float f; + std::istringstream ss(s); + ss>>f; + return f; +} + +//#endif + +#define stoi mystoi +#define stof mystof -struct ValueSpec +inline std::string itos(s32 i) { - ValueSpec(ValueType a_type, const char *a_help=NULL) + std::ostringstream o; + o< +class Queue +{ +public: + void push_back(T t) + { + m_list.push_back(t); } + + T pop_front() + { + if(m_list.size() == 0) + throw ItemNotFoundException("Queue: queue is empty"); - /* - Reads a configuration object from stream (usually a single line) - and adds it to dst. - - Preserves comments and empty lines. + typename core::list::Iterator begin = m_list.begin(); + T t = *begin; + m_list.erase(begin); + return t; + } + T pop_back() + { + if(m_list.size() == 0) + throw ItemNotFoundException("Queue: queue is empty"); - Settings that were added to dst are also added to updated. - key of updated is setting name, value of updated is dummy. + typename core::list::Iterator last = m_list.getLast(); + T t = *last; + m_list.erase(last); + return t; + } - Returns false on EOF - */ - bool getUpdatedConfigObject(std::istream &is, - core::list &dst, - core::map &updated) + u32 size() { - if(is.eof()) - return false; - - // NOTE: This function will be expanded to allow multi-line settings - std::string line; - std::getline(is, line); - - std::string trimmedline = trim(line); + return m_list.size(); + } - std::string line_end = ""; - if(is.eof() == false) - line_end = "\n"; - - // Ignore comments - if(trimmedline[0] == '#') - { - dst.push_back(line+line_end); - return true; - } +protected: + core::list m_list; +}; - Strfnd sf(trim(line)); +/* + Thread-safe FIFO queue (well, actually a FILO also) +*/ - std::string name = sf.next("="); - name = trim(name); +template +class MutexedQueue +{ +public: + MutexedQueue() + { + m_mutex.Init(); + } + u32 size() + { + JMutexAutoLock lock(m_mutex); + return m_list.size(); + } + void push_back(T t) + { + JMutexAutoLock lock(m_mutex); + m_list.push_back(t); + } + T pop_front(u32 wait_time_max_ms=0) + { + u32 wait_time_ms = 0; - if(name == "") - { - dst.push_back(line+line_end); - return true; - } - - std::string value = sf.next("\n"); - value = trim(value); - - if(m_settings.find(name)) + for(;;) { - std::string newvalue = m_settings[name]; - - if(newvalue != value) { - dstream<<"Changing value of \""< \""< objects; - core::map updated; - - // Read and modify stuff - { - std::ifstream is(filename); - if(is.good() == false) - { - dstream<<"Error opening configuration file" - " for reading: \"" - <::Iterator - i = objects.begin(); - i != objects.end(); i++) { - os<<(*i); - } + JMutexAutoLock lock(m_mutex); - /* - Write stuff that was not already in the file - */ - for(core::map::Iterator - i = m_settings.getIterator(); - i.atEnd() == false; i++) - { - if(updated.find(i.getNode()->getKey())) - continue; - std::string name = i.getNode()->getKey(); - std::string value = i.getNode()->getValue(); - dstream<<"Adding \""< 0) + { + typename core::list::Iterator last = m_list.getLast(); + T t = *last; + m_list.erase(last); + return t; + } + + if(wait_time_ms >= wait_time_max_ms) + throw ItemNotFoundException("MutexedQueue: queue is empty"); } + + // Wait a while before trying again + sleep_ms(10); + wait_time_ms += 10; } - - return true; } - /* - NOTE: Types of allowed_options are ignored + JMutex & getMutex() + { + return m_mutex; + } - returns true on success - */ - bool parseCommandLine(int argc, char *argv[], - core::map &allowed_options) + core::list & getList() { - int i=1; - for(;;) - { - if(i >= argc) - break; - std::string argname = argv[i]; - if(argname.substr(0, 2) != "--") - { - dstream<<"Invalid command-line parameter \"" - < expected."< m_list; +}; - core::map::Node *n; - n = allowed_options.find(name); - if(n == NULL) - { - dstream<<"Unknown command-line parameter \"" - <getValue().type; +template +class CallerInfo +{ +public: + Caller caller; + Data data; +}; - std::string value = ""; - - if(type == VALUETYPE_FLAG) - { - value = "true"; - } - else - { - if(i >= argc) - { - dstream<<"Invalid command-line parameter \"" - < +class GetResult +{ +public: + Key key; + T item; + core::list > callers; +}; - dstream<<"Valid command-line parameter: \"" - < +class ResultQueue: public MutexedQueue< GetResult > +{ +}; - return true; +template +class GetRequest +{ +public: + GetRequest() + { + dest = NULL; } - - void set(std::string name, std::string value) + GetRequest(ResultQueue *a_dest) { - m_settings[name] = value; + dest = a_dest; } - - void setDefault(std::string name, std::string value) + GetRequest(ResultQueue *a_dest, + Key a_key) { - m_defaults[name] = value; + dest = a_dest; + key = a_key; } + ~GetRequest() + { + } + + Key key; + ResultQueue *dest; + core::list > callers; +}; - bool exists(std::string name) +template +class RequestQueue +{ +public: + u32 size() { - return (m_settings.find(name) || m_defaults.find(name)); + return m_queue.size(); } - std::string get(std::string name) + void add(Key key, Caller caller, CallerData callerdata, + ResultQueue *dest) { - core::map::Node *n; - n = m_settings.find(name); - if(n == NULL) + JMutexAutoLock lock(m_queue.getMutex()); + + /* + If the caller is already on the list, only update CallerData + */ + for(typename core::list< GetRequest >::Iterator + i = m_queue.getList().begin(); + i != m_queue.getList().end(); i++) { - n = m_defaults.find(name); - if(n == NULL) + GetRequest &request = *i; + + if(request.key == key) { - throw SettingNotFoundException("Setting not found"); + for(typename core::list< CallerInfo >::Iterator + i = request.callers.begin(); + i != request.callers.end(); i++) + { + CallerInfo &ca = *i; + if(ca.caller == caller) + { + ca.data = callerdata; + return; + } + } + CallerInfo ca; + ca.caller = caller; + ca.data = callerdata; + request.callers.push_back(ca); + return; } } - return n->getValue(); + /* + Else add a new request to the queue + */ + + GetRequest request; + request.key = key; + CallerInfo ca; + ca.caller = caller; + ca.data = callerdata; + request.callers.push_back(ca); + request.dest = dest; + + m_queue.getList().push_back(request); } - bool getBool(std::string name) + GetRequest pop(bool wait_if_empty=false) { - return is_yes(get(name)); + return m_queue.pop_front(wait_if_empty); } + +private: + MutexedQueue< GetRequest > m_queue; +}; + +/* + Pseudo-random (VC++ rand() sucks) +*/ +int myrand(void); +void mysrand(unsigned seed); +#define MYRAND_MAX 32767 + +int myrand_range(int min, int max); + +/* + Miscellaneous functions +*/ + +bool isBlockInSight(v3s16 blockpos_b, v3f camera_pos, v3f camera_dir, + f32 camera_fov, f32 range, f32 *distance_ptr=NULL); + +/* + Queue with unique values with fast checking of value existence +*/ + +template +class UniqueQueue +{ +public: - bool getFlag(std::string name) + /* + Does nothing if value is already queued. + Return value: + true: value added + false: value already exists + */ + bool push_back(Value value) { - try - { - return getBool(name); - } - catch(SettingNotFoundException &e) - { + // Check if already exists + if(m_map.find(value) != NULL) return false; - } - } - // Asks if empty - bool getBoolAsk(std::string name, std::string question, bool def) - { - std::string s = get(name); - if(s != "") - return is_yes(s); + // Add + m_map.insert(value, 0); + m_list.push_back(value); - char templine[10]; - std::cout<>f; - return f; + typename core::list::Iterator i = m_list.begin(); + Value value = *i; + m_map.remove(value); + m_list.erase(i); + return value; } - u16 getU16(std::string name) + u32 size() { - return stoi(get(name), 0, 65535); + assert(m_list.size() == m_map.size()); + return m_list.size(); } - u16 getU16Ask(std::string name, std::string question, u16 def) - { - std::string s = get(name); - if(s != "") - return stoi(s, 0, 65535); - - char templine[10]; - std::cout< m_map; + core::list m_list; +}; - s16 getS16(std::string name) +#if 1 +template +class MutexedMap +{ +public: + MutexedMap() { - return stoi(get(name), -32768, 32767); + m_mutex.Init(); + assert(m_mutex.IsInitialized()); } + + void set(const Key &name, const Value &value) + { + JMutexAutoLock lock(m_mutex); - s32 getS32(std::string name) + m_values[name] = value; + } + + bool get(const Key &name, Value *result) { - return stoi(get(name)); + JMutexAutoLock lock(m_mutex); + + typename core::map::Node *n; + n = m_values.find(name); + + if(n == NULL) + return false; + + if(result != NULL) + *result = n->getValue(); + + return true; } private: - core::map m_settings; - core::map m_defaults; + core::map m_values; + JMutex m_mutex; }; +#endif /* - A thread-safe texture cache. + Generates ids for comparable values. + Id=0 is reserved for "no value". - This is used so that irrlicht doesn't get called from many threads -*/ + Is fast at: + - Returning value by id (very fast) + - Returning id by value + - Generating a new id for a value -class TextureCache + Is not able to: + - Remove an id/value pair (is possible to implement but slow) +*/ +template +class MutexedIdGenerator { public: - TextureCache() + MutexedIdGenerator() { m_mutex.Init(); assert(m_mutex.IsInitialized()); } - void set(std::string name, video::ITexture *texture) + // Returns true if found + bool getValue(u32 id, T &value) { + if(id == 0) + return false; JMutexAutoLock lock(m_mutex); - - m_textures[name] = texture; + if(m_id_to_value.size() < id) + return false; + value = m_id_to_value[id-1]; + return true; } - video::ITexture* get(std::string name) + // If id exists for value, returns the id. + // Otherwise generates an id for the value. + u32 getId(const T &value) { JMutexAutoLock lock(m_mutex); - - core::map::Node *n; - n = m_textures.find(name); - + typename core::map::Node *n; + n = m_value_to_id.find(value); if(n != NULL) return n->getValue(); - - return NULL; + m_id_to_value.push_back(value); + u32 new_id = m_id_to_value.size(); + m_value_to_id.insert(value, new_id); + return new_id; } private: - core::map m_textures; JMutex m_mutex; + // Values are stored here at id-1 position (id 1 = [0]) + core::array m_id_to_value; + core::map m_value_to_id; +}; + +/* + Checks if a string contains only supplied characters +*/ +inline bool string_allowed(const std::string &s, const std::string &allowed_chars) +{ + for(u32 i=0; i(b)?(a):(b)) + +/* + Returns nearest 32-bit integer for given floating point number. + and in VC++ don't provide round(). +*/ +inline s32 myround(f32 f) +{ + return floor(f + 0.5); +} + +/* + Returns integer position of node in given floating point position +*/ +inline v3s16 floatToInt(v3f p, f32 d) +{ + v3s16 p2( + (p.X + (p.X>0 ? d/2 : -d/2))/d, + (p.Y + (p.Y>0 ? d/2 : -d/2))/d, + (p.Z + (p.Z>0 ? d/2 : -d/2))/d); + return p2; +} + +/* + Returns floating point position of node in given integer position +*/ +inline v3f intToFloat(v3s16 p, f32 d) +{ + v3f p2( + (f32)p.X * d, + (f32)p.Y * d, + (f32)p.Z * d + ); + return p2; +} + +/* + More serialization stuff +*/ + +// Creates a string with the length as the first two bytes +inline std::string serializeString(const std::string &plain) +{ + //assert(plain.size() <= 65535); + if(plain.size() > 65535) + throw SerializationError("String too long for serializeString"); + char buf[2]; + writeU16((u8*)&buf[0], plain.size()); + std::string s; + s.append(buf, 2); + s.append(plain); + return s; +} + +// Creates a string with the length as the first two bytes from wide string +inline std::string serializeWideString(const std::wstring &plain) +{ + //assert(plain.size() <= 65535); + if(plain.size() > 65535) + throw SerializationError("String too long for serializeString"); + char buf[2]; + writeU16((u8*)buf, plain.size()); + std::string s; + s.append(buf, 2); + for(u32 i=0; i buf2(s_size); + is.read(&buf2[0], s_size); + std::string s; + s.reserve(s_size); + s.append(&buf2[0], s_size); + return s; +} + +// Reads a wide string with the length as the first two bytes +inline std::wstring deSerializeWideString(std::istream &is) +{ + char buf[2]; + is.read(buf, 2); + if(is.gcount() != 2) + throw SerializationError("deSerializeString: size not read"); + u16 s_size = readU16((u8*)buf); + if(s_size == 0) + return L""; + std::wstring s; + s.reserve(s_size); + for(u32 i=0; i buf2(s_size); + is.read(&buf2[0], s_size); + std::string s; + s.reserve(s_size); + s.append(&buf2[0], s_size); + return s; +} + +// Creates a string encoded in JSON format (almost equivalent to a C string literal) +std::string serializeJsonString(const std::string &plain); + +// Reads a string encoded in JSON format +std::string deSerializeJsonString(std::istream &is); + +// + +inline u32 time_to_daynight_ratio(u32 time_of_day) +{ + const s32 daylength = 16; + const s32 nightlength = 6; + const s32 daytimelength = 8; + s32 d = daylength; + s32 t = (((time_of_day)%24000)/(24000/d)); + if(t < nightlength/2 || t >= d - nightlength/2) + //return 300; + return 350; + else if(t >= d/2 - daytimelength/2 && t < d/2 + daytimelength/2) + return 1000; + else + return 750; +} + +// Random helper. Usually d=BS +inline core::aabbox3d getNodeBox(v3s16 p, float d) +{ + return core::aabbox3d( + (float)p.X * d - 0.5*d, + (float)p.Y * d - 0.5*d, + (float)p.Z * d - 0.5*d, + (float)p.X * d + 0.5*d, + (float)p.Y * d + 0.5*d, + (float)p.Z * d + 0.5*d + ); +} + +class IntervalLimiter +{ +public: + IntervalLimiter(): + m_accumulator(0) + { + } + /* + dtime: time from last call to this method + wanted_interval: interval wanted + return value: + true: action should be skipped + false: action should be done + */ + bool step(float dtime, float wanted_interval) + { + m_accumulator += dtime; + if(m_accumulator < wanted_interval) + return false; + m_accumulator -= wanted_interval; + return true; + } +protected: + float m_accumulator; +}; + +/* + Splits a list into "pages". For example, the list [1,2,3,4,5] split + into two pages would be [1,2,3],[4,5]. This function computes the + minimum and maximum indices of a single page. + + length: Length of the list that should be split + page: Page number, 1 <= page <= pagecount + pagecount: The number of pages, >= 1 + minindex: Receives the minimum index (inclusive). + maxindex: Receives the maximum index (exclusive). + + Ensures 0 <= minindex <= maxindex <= length. +*/ +inline void paging(u32 length, u32 page, u32 pagecount, u32 &minindex, u32 &maxindex) +{ + if(length < 1 || pagecount < 1 || page < 1 || page > pagecount) + { + // Special cases or invalid parameters + minindex = maxindex = 0; + } + else if(pagecount <= length) + { + // Less pages than entries in the list: + // Each page contains at least one entry + minindex = (length * (page-1) + (pagecount-1)) / pagecount; + maxindex = (length * page + (pagecount-1)) / pagecount; + } + else + { + // More pages than entries in the list: + // Make sure the empty pages are at the end + if(page < length) + { + minindex = page-1; + maxindex = page; + } + else + { + minindex = 0; + maxindex = 0; + } + } +} + +std::string translatePassword(std::string playername, std::wstring password); + +enum PointedThingType +{ + POINTEDTHING_NOTHING, + POINTEDTHING_NODE, + POINTEDTHING_OBJECT +}; + +struct PointedThing +{ + PointedThingType type; + v3s16 node_undersurface; + v3s16 node_abovesurface; + s16 object_id; + + PointedThing(); + std::string dump() const; + void serialize(std::ostream &os) const; + void deSerialize(std::istream &is); + bool operator==(const PointedThing &pt2) const; + bool operator!=(const PointedThing &pt2) const; }; #endif