removal of hashtables and everything based on hashbase from tools.h

.gitignore

@@ -16,7 +16,9 @@ src/tess_server
 *.srctrldb
 *.srctrlbm
 *.srctrlprj
-.ionide
+# Ignore VSCode specific files
+.ionide/
+.vscode/*
 # Files auto-produced by CMake
 cmake-build-*/
 # Documentation files in the docs folder.
@@ -26,4 +28,4 @@ docs
 # Ignore Code Spell Checker plugin files.
 cspell.json
 # Ignore html folder produced by Doxygen/Doxywizard.
-html/
+html/

src/engine/interface/console.cpp

@@ -2,7 +2,6 @@
 
 #include "../libprimis-headers/cube.h"
 #include "../../shared/stream.h"
-#include "../../shared/hashtable.h"
 
 #include "console.h"
 #include "control.h"
@@ -25,17 +24,21 @@ struct FilesKey
 
     FilesKey() {}
     FilesKey(int type, const char *dir, const char *ext) : type(type), dir(dir), ext(ext) {}
+
 };
 
-static inline bool htcmp(const FilesKey &x, const FilesKey &y)
-{
+static inline bool operator==(const FilesKey &x, const FilesKey &y) {
     return x.type == y.type && !std::strcmp(x.dir, y.dir) && (x.ext == y.ext || (x.ext && y.ext && !std::strcmp(x.ext, y.ext)));
 }
 
-static inline uint hthash(const FilesKey &k)
-{
-    return hthash(k.dir);
-}
+template<>
+struct std::hash<FilesKey> {
+    size_t operator()(const FilesKey &k) const noexcept {
+        return std::hash<const char*>{}(k.dir);
+    }
+};
+
+
 
 namespace
 {
@@ -294,7 +297,7 @@ namespace
         }
     }
 
-    hashtable<int, KeyM> keyms(256);
+    static std::map<int, KeyM> keyms;
 
     void keymap(int *code, char *key)
     {
@@ -312,7 +315,7 @@ namespace
     void searchbinds(char *action, int type)
     {
         std::vector<char> names;
-        ENUMERATE(keyms, KeyM, km,
+        for(auto &[k, km] : keyms)
         {
             if(!std::strcmp(km.actions[type], action))
             {
@@ -325,20 +328,20 @@ namespace
                     names.push_back(km.name[i]);
                 }
             }
-        });
+        };
         names.push_back('\0');
         result(names.data());
     }
 
     KeyM *findbind(char *key)
     {
-        ENUMERATE(keyms, KeyM, km,
+        for(auto &[k, km] : keyms)
         {
             if(!strcasecmp(km.name, key))
             {
                 return &km;
             }
-        });
+        };
         return nullptr;
     }
 
@@ -896,8 +899,9 @@ namespace
         return d;
     }
 
-    hashtable<FilesKey, FilesVal *> completefiles;
-    hashtable<char *, FilesVal *> completions;
+    std::unordered_map<FilesKey, FilesVal *> completefiles;
+    std::unordered_map<std::string, FilesVal *> completions;
+
 
     int completesize = 0;
     char *lastcomplete = nullptr;
@@ -916,10 +920,10 @@ namespace
         }
         if(!dir[0])
         {
-            FilesVal **hasfiles = completions.access(command);
-            if(hasfiles)
+            auto hasfilesiterator = completions.find(command);
+            if(hasfilesiterator != completions.end())
             {
-                *hasfiles = nullptr;
+                hasfilesiterator->second = nullptr;
             }
             return;
         }
@@ -943,25 +947,28 @@ namespace
             }
         }
         FilesKey key(type, dir, ext);
-        FilesVal **val = completefiles.access(key);
-        if(!val)
+        auto valiterator = completefiles.find(key);
+        FilesVal *val = nullptr;
+        if(valiterator == completefiles.end())
         {
+            val = valiterator->second;
             FilesVal *f = new FilesVal(type, dir, ext);
             if(type==Files_List)
             {
                 explodelist(dir, f->files);
             }
-            val = &completefiles[FilesKey(type, f->dir, f->ext)];
-            *val = f;
+            val = completefiles[FilesKey(type, f->dir, f->ext)];
+            val = f;
         }
-        FilesVal **hasfiles = completions.access(command);
-        if(hasfiles)
+        auto hasfilesiterator = completions.find(command);
+        FilesVal *hasfiles = nullptr; 
+        if(hasfilesiterator != completions.end())
         {
-            *hasfiles = *val;
+            hasfiles = val;
         }
         else
         {
-            completions[newstring(command)] = *val;
+            completions[command] = val;
         }
     }
 
@@ -1002,7 +1009,9 @@ namespace
             char *end = std::strchr(&s[cmdlen], ' ');
             if(end)
             {
-                f = completions.find(stringslice(&s[cmdlen], end), nullptr);
+                const char *slice = stringslice(&s[cmdlen], end).str;
+                auto findf = completions.find(slice);
+                f = (findf == completions.end()) ? nullptr : findf->second;
             }
         }
         const char *nextcomplete = nullptr;
@@ -1067,7 +1076,10 @@ void processtextinput(const char *str, int len)
 
 void processkey(int code, bool isdown, int map)
 {
-    KeyM *haskey = keyms.access(code);
+
+    auto haskeyiterator = keyms.find(code);
+    KeyM *haskey = haskeyiterator == keyms.end() ? nullptr : &haskeyiterator->second;
+
     if(haskey && haskey->pressed)
     {
         execbind(*haskey, isdown, map); // allow pressed keys to release
@@ -1151,7 +1163,7 @@ void conoutf(int type, const char *fmt, ...)
 
 const char *getkeyname(int code)
 {
-    KeyM *km = keyms.access(code);
+    KeyM *km = &keyms[code];
     return km ? km->name : nullptr;
 }
 
@@ -1174,7 +1186,10 @@ void writebinds(std::fstream& f)
 {
     static const char * const cmds[3] = { "bind", "specbind", "editbind" };
     std::vector<KeyM *> binds;
-    ENUMERATE(keyms, KeyM, km, binds.push_back(&km));
+    for(auto &[k, km] : keyms)
+    { 
+        binds.push_back(&km);
+    }
     std::sort(binds.begin(), binds.end());
     for(int j = 0; j < 3; ++j)
     {
@@ -1199,18 +1214,18 @@ void writebinds(std::fstream& f)
 //print to a stream f the listcompletions in the completions filesval
 void writecompletions(std::fstream& f)
 {
-    std::vector<char *> cmds;
-    ENUMERATE_KT(completions, char *, k, FilesVal *, v,
+    std::vector<const char *> cmds;
+    for (auto& [k,v]: completions)
     {
         if(v)
         {
-            cmds.push_back(k);
+            cmds.push_back(k.c_str());
         }
-    });
+    }
     std::sort(cmds.begin(), cmds.end());
     for(uint i = 0; i < cmds.size(); i++)
     {
-        char *k = cmds[i];
+        const char *k = cmds[i];
         FilesVal *v = completions[k];
         if(v->type==Files_List)
         {
@@ -1307,25 +1322,37 @@ void initconsolecmds()
 
     static auto clearbinds = [] ()
     {
-        ENUMERATE(keyms, KeyM, km, km.clear(KeyM::Action_Default));
+        for(auto &[k, km] : keyms)
+        {
+            km.clear(KeyM::Action_Default);
+        }
     };
     addcommand("clearbinds", reinterpret_cast<identfun>(+clearbinds), "", Id_Command);
 
     static auto clearspecbinds = [] ()
     {
-        ENUMERATE(keyms, KeyM, km, km.clear(KeyM::Action_Spectator));
+        for(auto &[k, km] : keyms)
+        {
+            km.clear(KeyM::Action_Spectator);
+        }
     };
     addcommand("clearspecbinds", reinterpret_cast<identfun>(+clearspecbinds), "", Id_Command);
 
     static auto cleareditbinds = [] ()
     {
-        ENUMERATE(keyms, KeyM, km, km.clear(KeyM::Action_Editing));
+        for(auto &[k, km] : keyms) 
+        {
+            km.clear(KeyM::Action_Editing);
+        }
     };
     addcommand("cleareditbinds", reinterpret_cast<identfun>(+cleareditbinds), "", Id_Command);
 
     static auto clearallbinds = [] ()
     {
-        ENUMERATE(keyms, KeyM, km, km.clear());
+        for(auto &[k, km] : keyms)
+        { 
+            km.clear();
+        }
     };
     addcommand("clearallbinds", reinterpret_cast<identfun>(+clearallbinds), "", Id_Command);
     addcommand("inputcommand", reinterpret_cast<identfun>(inputcommand), "ssss", Id_Command);

src/engine/interface/ui.cpp

@@ -13,7 +13,6 @@
 #include "../../shared/geomexts.h"
 #include "../../shared/glemu.h"
 #include "../../shared/glexts.h"
-#include "../../shared/hashtable.h"
 
 #include "console.h"
 #include "control.h"
@@ -979,7 +978,7 @@ namespace UI
         }
     };
 
-    static hashnameset<Window *> windows;
+    static std::map<std::string, Window *> windows;
 
     void ClipArea::scissor()
     {
@@ -4379,14 +4378,16 @@ namespace UI
     //new ui command
     void newui(char *name, char *contents, char *onshow, char *onhide)
     {
-        Window *window = windows.find(name, nullptr);
-        if(window)
+        auto search = windows.find(name);
+        if(search != windows.end())
         {
+            auto [key, window] = *search; // I may have broken this, remove this comment if engine compiles/works. Issue #257
             if (window == UI::window)
             {
                 return;
             }
-            world->hide(window); windows.remove(name);
+            world->hide(window);
+            windows.erase(name);
             delete window;
         }
         windows[name] = new Window(name, contents, onshow, onhide);
@@ -4420,8 +4421,8 @@ namespace UI
 
     bool showui(const char *name)
     {
-        Window *window = windows.find(name, nullptr);
-        return window && world->show(window);
+        auto search = windows.find(name);
+        return search != windows.end() && world->show(search->second);
     }
 
     bool hideui(const char *name)
@@ -4430,8 +4431,8 @@ namespace UI
         {
             return world->hideall() > 0;
         }
-        Window *window = windows.find(name, nullptr);
-        return window && world->hide(window);
+        auto search = windows.find(name);
+        return search != windows.end() && world->hide(search->second);
     }
 
     bool toggleui(const char *name)
@@ -4462,8 +4463,8 @@ namespace UI
         {
             return world->children.size() > 0;
         }
-        Window *window = windows.find(name, nullptr);
-        return window && std::find(world->children.begin(), world->children.end(), window) != world->children.end();
+        auto search = windows.find(name);
+        return search != windows.end() && std::find(world->children.begin(), world->children.end(), search->second) != world->children.end();
     }
 
     void ifstateval(bool state, tagval * t, tagval * f)
@@ -4838,7 +4839,7 @@ namespace UI
     void cleanup()
     {
         world->children.resize(0);
-        ENUMERATE(windows, Window *, w, delete w);
+        for(auto &[k, w] : windows) { delete w; }
         windows.clear();
         if(world)
         {

src/engine/model/animmodel.cpp

@@ -73,18 +73,14 @@ Texture *animmodel::lasttex = nullptr,
 int animmodel::matrixpos = 0;
 matrix4 animmodel::matrixstack[64];
 
-hashtable<animmodel::shaderparams, animmodel::ShaderParamsKey> animmodel::ShaderParamsKey::keys;
+std::unordered_map<animmodel::shaderparams, animmodel::ShaderParamsKey> animmodel::ShaderParamsKey::keys;
 int animmodel::ShaderParamsKey::firstversion = 0,
     animmodel::ShaderParamsKey::lastversion = 1;
 
-uint hthash(const animmodel::shaderparams &k)
-{
-    return memhash(&k, sizeof(k));
-}
 
-bool htcmp(const animmodel::shaderparams &x, const animmodel::shaderparams &y)
+bool animmodel::shaderparams::operator==(const animmodel::shaderparams& other) const
 {
-    return !std::memcmp(&x, &y, sizeof(animmodel::shaderparams));
+    return !std::memcmp(this, &other, sizeof(animmodel::shaderparams));
 }
 
 //animmodel
@@ -170,7 +166,10 @@ bool animmodel::ShaderParamsKey::checkversion()
     version = lastversion;
     if(++lastversion <= 0)
     {
-        ENUMERATE(keys, ShaderParamsKey, key, key.version = -1);
+        for(auto& [k, key] : keys) 
+        {
+            key.version = -1;
+        }
         firstversion = 0;
         lastversion = 1;
         version = 0;