Merge remote-tracking branch 'origin/dev-non-chip8-support' into dev-…

…non-chip8-support
gulrak · Mar 23, 2024 · 012ed81 · 012ed81
2 parents 8d19428 + 646775c
commit 012ed81
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 75 deletions.
diff --git a/external/rlguipp/rlguipp4.hpp b/external/rlguipp/rlguipp4.hpp
@@ -417,43 +417,41 @@ struct GuiContext
             }
         }
     }
+    static void handleDeferredDropBox(int*const & active, DropdownInfo& info)
+    {
+        if (info.lastDraw < info.lastUpdate && info.lastUpdate == frameId) {
+            for (int i = 0; i < RAYGUI_MAX_PROPS_BASE + RAYGUI_MAX_PROPS_EXTENDED; ++i) {
+                SetStyle(DROPDOWNBOX, i, info.style[i]);
+            }
+            auto oldState = GuiGetState();
+            if(info.guiDisabled)
+                GuiDisable();
+            if (info.directionUp ? GuiDropupBox(info.rect, info.text.c_str(), active, info.editMode) : GuiDropdownBox(info.rect, info.text.c_str(), active, info.editMode)) {
+                if (openDropdownboxId != active) {
+                    closeOpenDropdownBox();
+                }
+                info.clicked = info.editMode;
+                info.editMode = !info.editMode;
+                openDropdownboxId = info.editMode ? active : nullptr;
+            }
+            else {
+                info.clicked = false;
+            }
+            if(info.guiDisabled)
+                GuiEnable();
+            info.lastDraw = info.lastUpdate;
+        }
+    }
     static void handleDeferredDropBoxes()
     {
         for (auto& [active, info] : dropdownBoxes) {
-            if (info.lastDraw < info.lastUpdate && info.lastUpdate == frameId) {
-                for (int i = 0; i < RAYGUI_MAX_PROPS_BASE + RAYGUI_MAX_PROPS_EXTENDED; ++i) {
-                    SetStyle(DROPDOWNBOX, i, info.style[i]);
-                }
-                /*auto r = info.rect;
-                auto r2 = r;
-                bool shifted = false;
-                if(info.editMode) {
-                    auto count = std::count_if( info.text.begin(), info.text.end(), []( char c ){return c ==';';}) + 2;
-                    if(r.y + count*r.height > 192*2+36) {
-                        r.y = 192*2+36 - count*r.height - 4;
-                        r2 = r;
-                        r2.height = 192*2+36 - count*r.height;
-                        shifted = true;
-                    }
-                }
-                bool wasEdit = info.editMode;*/
-                auto oldState = GuiGetState();
-                if(info.guiDisabled)
-                    GuiDisable();
-                if (info.directionUp ? GuiDropupBox(info.rect, info.text.c_str(), active, info.editMode) : GuiDropdownBox(info.rect, info.text.c_str(), active, info.editMode)) {
-                    if (openDropdownboxId != active) {
-                        closeOpenDropdownBox();
-                    }
-                    info.clicked = info.editMode;
-                    info.editMode = !info.editMode;
-                    openDropdownboxId = info.editMode ? active : nullptr;
-                }
-                else {
-                    info.clicked = false;
-                }
-                if(info.guiDisabled)
-                    GuiEnable();
-                info.lastDraw = info.lastUpdate;
+            if(!info.editMode) {
+                handleDeferredDropBox(active, info);
+            }
+        }
+        for (auto& [active, info] : dropdownBoxes) {
+            if(info.editMode) {
+                handleDeferredDropBox(active, info);
             }
         }
         if(!GuiContext::tooltipText.empty()) {

diff --git a/src/emulation/chip8vip.cpp b/src/emulation/chip8vip.cpp
@@ -78,6 +78,7 @@ class Chip8VIP::Private {
             case Cdp186x::eCDP1861:
             default:
                 _properties[PROP_VIDEO].setSelectedIndex(0);
+                _properties[PROP_AUDIO].setSelectedIndex(0);
                 break;
         }
     }

diff --git a/src/emulation/properties.cpp b/src/emulation/properties.cpp
@@ -32,15 +32,38 @@
 namespace emu {
 
 std::map<std::string_view,Properties> Properties::propertyRegistry{};
-std::unordered_map<std::string,std::string> Properties::registeredKeys{};
-std::unordered_map<std::string,std::string> Properties::registeredJsonKeys{};
+
+
+Property::Property(std::string name, Value val, std::string additionalInfo, bool isReadOnly)
+    : _name(name)
+    , _jsonKey(Properties::makeJsonKey(name))
+    , _value(val)
+    , _additionalInfo(additionalInfo)
+    , _isReadonly(isReadOnly)
+{}
+
+Property::Property(std::string name, Value val, bool isReadOnly)
+    : _name(name)
+    , _jsonKey(Properties::makeJsonKey(name))
+    , _value(val)
+    , _isReadonly(isReadOnly)
+{}
+
+Property::Property(const Property& other)
+    : _name(other._name)
+    , _jsonKey(other._jsonKey)
+    , _value(other._value)
+    , _additionalInfo(other._additionalInfo)
+    , _isReadonly(other._isReadonly)
+{
+}
 
 void to_json(nlohmann::json& j, const Properties& props)
 {
     j = nlohmann::json::object();
     for(size_t i = 0; i < props.numProperties(); ++i) {
         const auto& prop = props[i];
-        auto name = Properties::makeJsonKey(prop.getName());
+        const auto& name = prop.getJsonKey();
         std::visit(emu::visitor{
                        [&](nullptr_t) { },
                        [&](bool val) { j[name] = val; },

diff --git a/src/emulation/properties.hpp b/src/emulation/properties.hpp
@@ -76,25 +76,12 @@ class Property
     };
     using Value = std::variant<nullptr_t,bool,Integer,std::string,Combo>;
 
-    Property(std::string name, Value val, std::string additionalInfo, bool isReadOnly = true)
-    : _name(name)
-    , _value(val)
-    , _additionalInfo(additionalInfo)
-    , _isReadonly(isReadOnly)
-    {}
-    Property(std::string name, Value val, bool isReadOnly = true)
-        : _name(name)
-        , _value(val)
-        , _isReadonly(isReadOnly)
-    {}
-    Property(const Property& other)
-        : _name(other._name)
-        , _value(other._value)
-        , _additionalInfo(other._additionalInfo)
-        , _isReadonly(other._isReadonly)
-    {
-    }
+    Property(std::string name, Value val, std::string additionalInfo, bool isReadOnly = true);
+    Property(std::string name, Value val, bool isReadOnly = true);
+    Property(const Property& other);
     const std::string& getName() const { return _name; }
+    const std::string& getJsonKey() const { return _jsonKey; }
+    void setJsonKey(const std::string& jsonKey) { _jsonKey = jsonKey; }
     const std::string& getAdditionalInfo() const { return _additionalInfo; }
     void setAdditionalInfo(std::string info) { _additionalInfo = std::move(info); }
     bool isReadonly() const { return _isReadonly; }
@@ -139,6 +126,7 @@ class Property
     }
 private:
     std::string _name;
+    std::string _jsonKey;
     Value _value;
     std::string _additionalInfo;
     bool _isReadonly{true};
@@ -152,7 +140,6 @@ class Properties {
     {
         auto iter = _valueMap.find(prop.getName());
         if(iter == _valueMap.end()) {
-            registerKey(prop.getName());
             _valueList.push_back(prop.getName());
             _valueMap.emplace(prop.getName(), prop);
         }
@@ -245,12 +232,6 @@ class Properties {
         }
         return key;
     }
-    inline static void registerKey(const std::string& key)
-    {
-        auto jsonKey = makeJsonKey(key);
-        registeredKeys[key] = jsonKey;
-        registeredJsonKeys[jsonKey] = key;
-    }
 private:
     std::vector<std::string> _valueList;
     std::map<std::string, Property> _valueMap;

diff --git a/tools/c8db.cpp b/tools/c8db.cpp
@@ -68,19 +68,6 @@ static bool platformMatchesOptions(const c8db::Platform& platform, const emu::Ch
     return false;
 }
 
-template<typename Iter>
-std::string join(Iter first, Iter last, const std::string& delimiter)
-{
-    std::ostringstream result;
-    for (Iter i = first; i != last; ++i) {
-        if (i != first) {
-            result << delimiter;
-        }
-        result << *i;
-    }
-    return result.str();
-}
-
 
 int main(int argc, char* argv[])
 {