Major bugfix

MHDtA-dev · MHDtA-dev · commit a7d89aea5a0a · 2024-09-10T14:55:35.000+03:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,6 +7,7 @@ include(FetchContent)
 
 file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/Resources/fonts DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/Resources/icons DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/Resources/imgui.ini DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 
 FetchContent_Declare(
         webgpu
diff --git a/Core/App.cpp b/Core/App.cpp
@@ -34,8 +34,14 @@ namespace LogiGates::Core {
 
     void App::run() {
         while (!this->window->shouldClose()) {
-            window->pollEvents([] (SDL_Event e) {
+            window->pollEvents([=] (SDL_Event e) {
                 ImGui_ImplSDL2_ProcessEvent(&e);
+
+                if (e.type == SDL_WINDOWEVENT) {
+                    if (e.window.event == SDL_WINDOWEVENT_RESIZED or e.window.event == SDL_WINDOWEVENT_SIZE_CHANGED) {
+                        renderer->windowResized(e.window.data1, e.window.data2);
+                    }
+                }
             });
 
             if (renderer->begin()) {
diff --git a/Core/LogicalElements/And.cpp b/Core/LogicalElements/And.cpp
@@ -38,11 +38,13 @@ namespace LogiGates::Core::LogicalElements {
         ImNodes::EndNode();
     }
 
-    void And::perform() {
+    void And::perform(std::set<int> performedIDs) {
+        if (this->checkRecursion(performedIDs)) return;
         if (pins[0]->getConnectedWith() != -1) pins[0]->setState(Pin::globalPinMap[pins[0]->getConnectedWith()]->getState());
         if (pins[1]->getConnectedWith() != -1) pins[1]->setState(Pin::globalPinMap[pins[1]->getConnectedWith()]->getState());
         pins[2]->setState(pins[0]->getState() and pins[1]->getState());
-        pins[2]->performNext();
+        performedIDs.emplace(this->id);
+        pins[2]->performNext(performedIDs);
     }
 
 
diff --git a/Core/LogicalElements/And.h b/Core/LogicalElements/And.h
@@ -28,7 +28,7 @@ namespace LogiGates::Core::LogicalElements {
             And(UI::Workspace* workspace);
 
             void render() override;
-            void perform() override;
+            void perform(std::set<int> performedIDs = {}) override;
     };
 
 }
diff --git a/Core/LogicalElements/Base.cpp b/Core/LogicalElements/Base.cpp
@@ -24,7 +24,7 @@ namespace LogiGates::Core::LogicalElements {
         nodeIDCounter++;
     }
 
-    void Base::perform() {
+    void Base::perform(std::set<int> performedIDs) {
 
     }
 
@@ -87,4 +87,13 @@ namespace LogiGates::Core::LogicalElements {
         return this->typeName;
     }
 
+    bool Base::checkRecursion(std::set<int> performedIDs) {
+        if (performedIDs.find(this->id) != performedIDs.end()) {
+            this->workspace->enableRecursionWarning();
+            return true;
+        }
+
+        return false;
+    }
+
 }
diff --git a/Core/LogicalElements/Base.h b/Core/LogicalElements/Base.h
@@ -18,6 +18,7 @@
 #define LOGIGATES_BASE_H
 
 #include <iostream>
+#include <set>
 #include <functional>
 
 #include "../Pin.h"
@@ -47,7 +48,7 @@ namespace LogiGates::Core::LogicalElements {
             Base(UI::Workspace* workspace);
             ~Base();
 
-            virtual void perform();
+            virtual void perform(std::set<int> performedIDs = {});
             virtual void render();
 
             int getID();
@@ -66,6 +67,8 @@ namespace LogiGates::Core::LogicalElements {
 
             std::string typeName;
 
+            bool checkRecursion(std::set<int> performedIDs);
+
     };
 
 }
diff --git a/Core/LogicalElements/Equivalent.cpp b/Core/LogicalElements/Equivalent.cpp
@@ -39,13 +39,15 @@ namespace LogiGates::Core::LogicalElements {
         ImNodes::EndNode();
     }
 
-    void Equivalent::perform() {
+    void Equivalent::perform(std::set<int> performedIDs) {
+        if (this->checkRecursion(performedIDs)) return;
         if (pins[0]->getConnectedWith() != -1)
             pins[0]->setState(Pin::globalPinMap[pins[0]->getConnectedWith()]->getState());
         if (pins[1]->getConnectedWith() != -1)
             pins[1]->setState(Pin::globalPinMap[pins[1]->getConnectedWith()]->getState());
         pins[2]->setState(pins[0]->getState() == pins[1]->getState());
-        pins[2]->performNext();
+        performedIDs.emplace(this->id);
+        pins[2]->performNext(performedIDs);
     }
 
 }
diff --git a/Core/LogicalElements/Equivalent.h b/Core/LogicalElements/Equivalent.h
@@ -28,7 +28,7 @@ namespace LogiGates::Core::LogicalElements {
             Equivalent(UI::Workspace* workspace);
 
             void render() override;
-            void perform() override;
+            void perform(std::set<int> performedIDs = {}) override;
     };
 
 }
diff --git a/Core/LogicalElements/FiveBitNumberDisplay.cpp b/Core/LogicalElements/FiveBitNumberDisplay.cpp
@@ -49,7 +49,8 @@ namespace LogiGates::Core::LogicalElements {
         ImNodes::EndNode();
     }
 
-    void FiveBitNumberDisplay::perform() {
+    void FiveBitNumberDisplay::perform(std::set<int> performedIDs) {
+        if (this->checkRecursion(performedIDs)) return;
         Pin* inputs[5] = {pins[0], pins[1], pins[2], pins[3], pins[4]};
 
         number = 0;
@@ -59,9 +60,11 @@ namespace LogiGates::Core::LogicalElements {
             number += inputs[4 - i]->getState() * pow(2, i);
         }
 
+        performedIDs.emplace(this->id);
+
         for (int i = 5; i < pins.size(); i++) {
             pins[i]->setState(pins[i - 5]->getState());
-            pins[i]->performNext();
+            pins[i]->performNext(performedIDs);
         }
     }
 
diff --git a/Core/LogicalElements/FiveBitNumberDisplay.h b/Core/LogicalElements/FiveBitNumberDisplay.h
@@ -32,7 +32,7 @@ namespace LogiGates::Core::LogicalElements {
             FiveBitNumberDisplay(UI::Workspace* workspace);
 
             void render() override;
-            void perform() override;
+            void perform(std::set<int> performedIDs = {}) override;
 
             SaveInfo getSaveInfo() override;
             void restoreFromSaveInfo(SaveInfo info) override;
diff --git a/Core/LogicalElements/FiveBitNumberEncoder.cpp b/Core/LogicalElements/FiveBitNumberEncoder.cpp
@@ -64,15 +64,16 @@ namespace LogiGates::Core::LogicalElements {
         ImNodes::EndNode();
     }
 
-    void FiveBitNumberEncoder::perform() {
+    void FiveBitNumberEncoder::perform(std::set<int> performedIDs) {
+        if (this->checkRecursion(performedIDs)) return;
         Pin *outputs[5] = {pins[4], pins[3], pins[2], pins[1], pins[0]};
 
         std::string binary = decToBaseReversed(number, 2);
-
+        performedIDs.emplace(this->id);
 
         for (int i = 0; i < 5; i++) {
             outputs[i]->setState(i < binary.size() and binary[i] == '1');
-            outputs[i]->performNext();
+            outputs[i]->performNext(performedIDs);
         }
     }
 
diff --git a/Core/LogicalElements/FiveBitNumberEncoder.h b/Core/LogicalElements/FiveBitNumberEncoder.h
@@ -33,14 +33,14 @@ namespace LogiGates::Core::LogicalElements {
             FiveBitNumberEncoder(UI::Workspace* workspace);
 
             void render() override;
-            void perform() override;
+            void perform(std::set<int> performedIDs = {}) override;
 
             SaveInfo getSaveInfo() override;
             void restoreFromSaveInfo(SaveInfo info) override;
 
         private:
             int last = -1;
-            int number;
+            int number = 0;
     };
 
 }
diff --git a/Core/LogicalElements/Implication.cpp b/Core/LogicalElements/Implication.cpp
@@ -40,13 +40,15 @@ namespace LogiGates::Core::LogicalElements {
         ImNodes::EndNode();
     }
 
-    void Implication::perform() {
+    void Implication::perform(std::set<int> performedIDs) {
+        if (this->checkRecursion(performedIDs)) return;
         if (pins[0]->getConnectedWith() != -1)
             pins[0]->setState(Pin::globalPinMap[pins[0]->getConnectedWith()]->getState());
         if (pins[1]->getConnectedWith() != -1)
             pins[1]->setState(Pin::globalPinMap[pins[1]->getConnectedWith()]->getState());
         pins[2]->setState(not pins[0]->getState() or pins[1]->getState());
-        pins[2]->performNext();
+        performedIDs.emplace(this->id);
+        pins[2]->performNext(performedIDs);
     }
 
 }
diff --git a/Core/LogicalElements/Implication.h b/Core/LogicalElements/Implication.h
@@ -28,7 +28,7 @@ namespace LogiGates::Core::LogicalElements {
             Implication(UI::Workspace* workspace);
 
             void render() override;
-            void perform() override;
+            void perform(std::set<int> performedIDs = {}) override;
     };
 
 }
diff --git a/Core/LogicalElements/Lamp.cpp b/Core/LogicalElements/Lamp.cpp
@@ -38,11 +38,13 @@ namespace LogiGates::Core::LogicalElements {
         ImNodes::EndNode();
     }
 
-    void Lamp::perform() {
+    void Lamp::perform(std::set<int> performedIDs) {
+        if (this->checkRecursion(performedIDs)) return;
         if (pins[0]->getConnectedWith() != -1)
             pins[0]->setState(Pin::globalPinMap[pins[0]->getConnectedWith()]->getState());
         pins[1]->setState(pins[0]->getState());
-        pins[1]->performNext();
+        performedIDs.emplace(this->id);
+        pins[1]->performNext(performedIDs);
     }
 
 }
diff --git a/Core/LogicalElements/Lamp.h b/Core/LogicalElements/Lamp.h
@@ -28,7 +28,7 @@ namespace LogiGates::Core::LogicalElements {
             Lamp(UI::Workspace* workspace);
 
             void render() override;
-            void perform() override;
+            void perform(std::set<int> performedIDs = {}) override;
     };
 
 }
diff --git a/Core/LogicalElements/Not.cpp b/Core/LogicalElements/Not.cpp
@@ -38,11 +38,13 @@ namespace LogiGates::Core::LogicalElements {
         ImNodes::EndNode();
     }
 
-    void Not::perform() {
+    void Not::perform(std::set<int> performedIDs) {
+        if (this->checkRecursion(performedIDs)) return;
         if (pins[0]->getConnectedWith() != -1)
             pins[0]->setState(Pin::globalPinMap[pins[0]->getConnectedWith()]->getState());
         pins[1]->setState(!pins[0]->getState());
-        pins[1]->performNext();
+        performedIDs.emplace(this->id);
+        pins[1]->performNext(performedIDs);
     }
 
 }
diff --git a/Core/LogicalElements/Not.h b/Core/LogicalElements/Not.h
@@ -28,7 +28,7 @@ namespace LogiGates::Core::LogicalElements {
             Not(UI::Workspace* workspace);
 
             void render() override;
-            void perform() override;
+            void perform(std::set<int> performedIDs = {}) override;
     };
 
 }
diff --git a/Core/LogicalElements/Or.cpp b/Core/LogicalElements/Or.cpp
@@ -41,13 +41,15 @@ namespace LogiGates::Core::LogicalElements {
         ImNodes::EndNode();
     }
 
-    void Or::perform() {
+    void Or::perform(std::set<int> performedIDs) {
+        if (this->checkRecursion(performedIDs)) return;
         if (pins[0]->getConnectedWith() != -1)
             pins[0]->setState(Pin::globalPinMap[pins[0]->getConnectedWith()]->getState());
         if (pins[1]->getConnectedWith() != -1)
             pins[1]->setState(Pin::globalPinMap[pins[1]->getConnectedWith()]->getState());
         pins[2]->setState(pins[0]->getState() or pins[1]->getState());
-        pins[2]->performNext();
+        performedIDs.emplace(this->id);
+        pins[2]->performNext(performedIDs);
     }
 
 }
diff --git a/Core/LogicalElements/Or.h b/Core/LogicalElements/Or.h
@@ -28,7 +28,7 @@ namespace LogiGates::Core::LogicalElements {
             Or(UI::Workspace* workspace);
 
             void render() override;
-            void perform() override;
+            void perform(std::set<int> performedIDs = {}) override;
     };
 
 }
diff --git a/Core/LogicalElements/Splitter.cpp b/Core/LogicalElements/Splitter.cpp
@@ -60,13 +60,16 @@ namespace LogiGates::Core::LogicalElements {
         ImNodes::EndNode();
     }
 
-    void Splitter::perform() {
+    void Splitter::perform(std::set<int> performedIDs) {
+        if (this->checkRecursion(performedIDs)) return;
         if (pins[0]->getConnectedWith() != -1)
             pins[0]->setState(Pin::globalPinMap[pins[0]->getConnectedWith()]->getState());
 
+        performedIDs.emplace(this->id);
+
         for (int i = 1; i < pins.size(); i++) {
             pins[i]->setState(pins[0]->getState());
-            pins[i]->performNext();
+            pins[i]->performNext(performedIDs);
         }
     }
 
diff --git a/Core/LogicalElements/Splitter.h b/Core/LogicalElements/Splitter.h
@@ -29,7 +29,7 @@ namespace LogiGates::Core::LogicalElements {
             Splitter(UI::Workspace* workspace);
 
             void render() override;
-            void perform() override;
+            void perform(std::set<int> performedIDs = {}) override;
 
             SaveInfo getSaveInfo() override;
             void restoreFromSaveInfo(SaveInfo info) override;
diff --git a/Core/LogicalElements/Switch.cpp b/Core/LogicalElements/Switch.cpp
@@ -33,7 +33,7 @@ namespace LogiGates::Core::LogicalElements {
                                                                   : UI::Images::icons["switch_off"]->texture), {70, 70},
                                {0, 0}, {1, 1})) {
             pins[0]->setState(!pins[0]->getState());
-            pins[0]->performNext();
+            this->perform();
         }
 
         for (Pin *p: pins) {
@@ -43,8 +43,10 @@ namespace LogiGates::Core::LogicalElements {
         ImNodes::EndNode();
     }
 
-    void Switch::perform() {
-        pins[0]->performNext();
+    void Switch::perform(std::set<int> performedIDs) {
+        if (this->checkRecursion(performedIDs)) return;
+        performedIDs.emplace(this->id);
+        pins[0]->performNext(performedIDs);
     }
 
 }
diff --git a/Core/LogicalElements/Switch.h b/Core/LogicalElements/Switch.h
@@ -28,7 +28,7 @@ namespace LogiGates::Core::LogicalElements {
             Switch(UI::Workspace* workspace);
 
             void render() override;
-            void perform() override;
+            void perform(std::set<int> performedIDs = {}) override;
     };
 
 }
diff --git a/Core/LogicalElements/Xor.cpp b/Core/LogicalElements/Xor.cpp
@@ -41,13 +41,15 @@ namespace LogiGates::Core::LogicalElements {
         ImNodes::EndNode();
     }
 
-    void Xor::perform() {
+    void Xor::perform(std::set<int> performedIDs) {
+        if (this->checkRecursion(performedIDs)) return;
         if (pins[0]->getConnectedWith() != -1)
             pins[0]->setState(Pin::globalPinMap[pins[0]->getConnectedWith()]->getState());
         if (pins[1]->getConnectedWith() != -1)
             pins[1]->setState(Pin::globalPinMap[pins[1]->getConnectedWith()]->getState());
         pins[2]->setState(pins[0]->getState() xor pins[1]->getState());
-        pins[2]->performNext();
+        performedIDs.emplace(this->id);
+        pins[2]->performNext(performedIDs);
     }
 
 }
diff --git a/Core/LogicalElements/Xor.h b/Core/LogicalElements/Xor.h
@@ -28,7 +28,7 @@ namespace LogiGates::Core::LogicalElements {
             Xor(UI::Workspace* workspace);
 
             void render() override;
-            void perform() override;
+            void perform(std::set<int> performedIDs = {}) override;
     };
 
 }
diff --git a/Core/Pin.cpp b/Core/Pin.cpp
@@ -75,9 +75,9 @@ namespace LogiGates::Core {
         this->state = state;
     }
 
-    void Pin::performNext() {
+    void Pin::performNext(std::set<int> performedIDs) {
         if (this->type == PinType::OUTPUT and this->nextElement != nullptr) {
-            this->nextElement->perform();
+            this->nextElement->perform(performedIDs);
         }
     }
 
diff --git a/Core/Pin.h b/Core/Pin.h
diff --git a/UI/Localization.cpp b/UI/Localization.cpp
diff --git a/UI/Renderer.cpp b/UI/Renderer.cpp
diff --git a/UI/Renderer.h b/UI/Renderer.h
diff --git a/UI/Window.cpp b/UI/Window.cpp
diff --git a/UI/imgui/AboutWindow.cpp b/UI/imgui/AboutWindow.cpp
diff --git a/UI/imgui/Dockspace.cpp b/UI/imgui/Dockspace.cpp
diff --git a/UI/imgui/Dockspace.h b/UI/imgui/Dockspace.h
diff --git a/UI/imgui/Workspace.cpp b/UI/imgui/Workspace.cpp
diff --git a/UI/imgui/Workspace.h b/UI/imgui/Workspace.h
diff --git a/thirdparty/imgui/imgui_impl_wgpu.cpp b/thirdparty/imgui/imgui_impl_wgpu.cpp
diff --git a/thirdparty/imgui/imgui_impl_wgpu.h b/thirdparty/imgui/imgui_impl_wgpu.h

Original file line number	Diff line number	Diff line change
`@@ -38,11 +38,13 @@ namespace LogiGates::Core::LogicalElements {`
`38`	`38`	`ImNodes::EndNode();`
`39`	`39`	`}`
`40`	`40`
`41`		`- void And::perform() {`
	`41`	`+ void And::perform(std::set<int> performedIDs) {`
	`42`	`+ if (this->checkRecursion(performedIDs)) return;`
`42`	`43`	`if (pins[0]->getConnectedWith() != -1) pins[0]->setState(Pin::globalPinMap[pins[0]->getConnectedWith()]->getState());`
`43`	`44`	`if (pins[1]->getConnectedWith() != -1) pins[1]->setState(Pin::globalPinMap[pins[1]->getConnectedWith()]->getState());`
`44`	`45`	`pins[2]->setState(pins[0]->getState() and pins[1]->getState());`
`45`		`- pins[2]->performNext();`
	`46`	`+ performedIDs.emplace(this->id);`
	`47`	`+ pins[2]->performNext(performedIDs);`
`46`	`48`	`}`
`47`	`49`
`48`	`50`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ namespace LogiGates::Core::LogicalElements {`
`28`	`28`	`And(UI::Workspace* workspace);`
`29`	`29`
`30`	`30`	`void render() override;`
`31`		`- void perform() override;`
	`31`	`+ void perform(std::set<int> performedIDs = {}) override;`
`32`	`32`	`};`
`33`	`33`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ namespace LogiGates::Core::LogicalElements {`
`24`	`24`	`nodeIDCounter++;`
`25`	`25`	`}`
`26`	`26`
`27`		`- void Base::perform() {`
	`27`	`+ void Base::perform(std::set<int> performedIDs) {`
`28`	`28`
`29`	`29`	`}`
`30`	`30`
`@@ -87,4 +87,13 @@ namespace LogiGates::Core::LogicalElements {`
`87`	`87`	`return this->typeName;`
`88`	`88`	`}`
`89`	`89`
	`90`	`+ bool Base::checkRecursion(std::set<int> performedIDs) {`
	`91`	`+ if (performedIDs.find(this->id) != performedIDs.end()) {`
	`92`	`+ this->workspace->enableRecursionWarning();`
	`93`	`+ return true;`
	`94`	`+ }`
	`95`	`+`
	`96`	`+ return false;`
	`97`	`+ }`
	`98`	`+`
`90`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,13 +39,15 @@ namespace LogiGates::Core::LogicalElements {`
`39`	`39`	`ImNodes::EndNode();`
`40`	`40`	`}`
`41`	`41`
`42`		`- void Equivalent::perform() {`
	`42`	`+ void Equivalent::perform(std::set<int> performedIDs) {`
	`43`	`+ if (this->checkRecursion(performedIDs)) return;`
`43`	`44`	`if (pins[0]->getConnectedWith() != -1)`
`44`	`45`	`pins[0]->setState(Pin::globalPinMap[pins[0]->getConnectedWith()]->getState());`
`45`	`46`	`if (pins[1]->getConnectedWith() != -1)`
`46`	`47`	`pins[1]->setState(Pin::globalPinMap[pins[1]->getConnectedWith()]->getState());`
`47`	`48`	`pins[2]->setState(pins[0]->getState() == pins[1]->getState());`
`48`		`- pins[2]->performNext();`
	`49`	`+ performedIDs.emplace(this->id);`
	`50`	`+ pins[2]->performNext(performedIDs);`
`49`	`51`	`}`
`50`	`52`
`51`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,8 @@ namespace LogiGates::Core::LogicalElements {`
`49`	`49`	`ImNodes::EndNode();`
`50`	`50`	`}`
`51`	`51`
`52`		`- void FiveBitNumberDisplay::perform() {`
	`52`	`+ void FiveBitNumberDisplay::perform(std::set<int> performedIDs) {`
	`53`	`+ if (this->checkRecursion(performedIDs)) return;`
`53`	`54`	`Pin* inputs[5] = {pins[0], pins[1], pins[2], pins[3], pins[4]};`
`54`	`55`
`55`	`56`	`number = 0;`
`@@ -59,9 +60,11 @@ namespace LogiGates::Core::LogicalElements {`
`59`	`60`	`number += inputs[4 - i]->getState() * pow(2, i);`
`60`	`61`	`}`
`61`	`62`
	`63`	`+ performedIDs.emplace(this->id);`
	`64`	`+`
`62`	`65`	`for (int i = 5; i < pins.size(); i++) {`
`63`	`66`	`pins[i]->setState(pins[i - 5]->getState());`
`64`		`- pins[i]->performNext();`
	`67`	`+ pins[i]->performNext(performedIDs);`
`65`	`68`	`}`
`66`	`69`	`}`
`67`	`70`