Merged master again.

2026-04-21 10:28:44 -05:00 · 2020-08-24 13:44:26 -04:00
parent 8aa087843b 0756bcb3c8
commit 25cd3fdc0b
190 changed files with 2586 additions and 41 deletions
@@ -0,0 +1,41 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2020                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#ifndef __OPENSPACE_MODULE_IMGUI___GUIMEMORYCOMPONENT___H__
+#define __OPENSPACE_MODULE_IMGUI___GUIMEMORYCOMPONENT___H__
+
+#include <modules/imgui/include/guicomponent.h>
+
+namespace openspace::gui {
+
+class GuiMemoryComponent : public GuiComponent {
+public:
+    GuiMemoryComponent();
+
+    void render() override;
+};
+
+} // namespace openspace::gui
+
+#endif // __OPENSPACE_MODULE_IMGUI___GUIMEMORYCOMPONENT___H__
@@ -0,0 +1,74 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2020                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include <modules/imgui/include/guimemorycomponent.h>
+
+#include <modules/imgui/include/imgui_include.h>
+#include <openspace/engine/globals.h>
+#include <openspace/util/memorymanager.h>
+
+namespace {
+    const ImVec2 Size = ImVec2(350, 500);
+
+    template <typename MemoryPool>
+    void renderMemoryPoolInformation(const MemoryPool& p) {
+        //ImGui::Text("Bucket Size: %i", p.BucketSize);
+        ImGui::Text("Number of Buckets: %i", p.nBuckets());
+        const std::vector<int>& occupancies = p.occupancies();
+        for (size_t i = 0; i < occupancies.size(); ++i) {
+            ImGui::Text(
+                "  %i: %i/%i (%.2f/%.2f kiB)",
+                i,
+                occupancies[i],
+                p._bucketSize,
+                occupancies[i] / 1024.f,
+                p._bucketSize / 1024.f
+            );
+        }
+    }
+} // namespace
+
+namespace openspace::gui {
+
+GuiMemoryComponent::GuiMemoryComponent()
+    : GuiComponent("memory_information", "Memory Information")
+{}
+
+void GuiMemoryComponent::render() {
+    ImGui::SetNextWindowCollapsed(_isCollapsed);
+
+    bool v = _isEnabled;
+    ImGui::Begin("Memory Information", &v, Size, 0.5f);
+    _isEnabled = v;
+    _isCollapsed = ImGui::IsWindowCollapsed();
+
+    ImGui::Text("%s", "Persistent Memory Pool");
+    renderMemoryPoolInformation(global::memoryManager.PersistentMemory);
+
+    ImGui::Text("%s", "Temporary Memory Pool");
+    renderMemoryPoolInformation(global::memoryManager.TemporaryMemory);
+    ImGui::End();
+}
+
+} // namespace openspace::gui