Merge branch 'master' of https://github.com/UniStuttgart-VISUS/megamol

UniStuttgart-VISUS · Feb 16, 2021 · c89fbc3 · c89fbc3
2 parents 3b9d651 + 1830ce6
commit c89fbc3
Show file tree

Hide file tree

Showing 25 changed files with 527 additions and 384 deletions.
diff --git a/core/src/view/light/DistantLight.cpp b/core/src/view/light/DistantLight.cpp
@@ -32,7 +32,7 @@ DistantLight::DistantLight(void)
     lightsource = std::make_shared<DistantLightType>();
 
     this->angularDiameter << new core::param::FloatParam(0.0f);
-    this->direction << new core::param::Vector3fParam(vislib::math::Vector<float, 3>(0.0f, -1.0f, 0.0f));
+    this->direction << new core::param::Vector3fParam(vislib::math::Vector<float, 3>(-0.25f, -0.5f, -0.75f));
     this->eye_direction << new core::param::BoolParam(0);
     this->MakeSlotAvailable(&this->direction);
     this->MakeSlotAvailable(&this->angularDiameter);

diff --git a/externals/CMakeExternals.cmake b/externals/CMakeExternals.cmake
@@ -377,8 +377,8 @@ function(require_external NAME)
     external_get_property(imgui INSTALL_DIR)
 
     add_external_project(imguizmoquat STATIC
-      GIT_REPOSITORY https://github.com/BrutPitt/imGuIZMO.quat.git
-      GIT_TAG "v3.0"
+      GIT_REPOSITORY https://github.com/braunms/imGuIZMO.quat.git
+      GIT_TAG "v3.0a"
       BUILD_BYPRODUCTS "<INSTALL_DIR>/${IMGUIZMOQUAT_LIB}"
       DEPENDS imgui
       CMAKE_ARGS

diff --git a/plugins/gui/src/Configurator.cpp b/plugins/gui/src/Configurator.cpp
@@ -5,15 +5,6 @@
  * Alle Rechte vorbehalten.
  */
 
-/**
- * USED HOTKEYS:
- *
- * - Search Module:        Ctrl + Shift + m
- * - Search Parameter:     Ctrl + Shift + p
- * - Save Edited Project:  Ctrl + Shift + s
- * - Delete Graph Item:    Delete
- */
-
 #include "stdafx.h"
 #include "Configurator.h"
 

diff --git a/plugins/gui/src/GUIUtils.h b/plugins/gui/src/GUIUtils.h
@@ -9,6 +9,27 @@
 #define MEGAMOL_GUI_GUIUTILS_INCLUDED
 
 
+/**
+ * USED HOTKEYS:
+ *
+ * ----- GUIWindows -----
+ * - Trigger Screenshot:        F2
+ * - Toggle Graph Entry:        F3
+ * - Show/hide Windows:         F7-F11
+ * - Show/hide Menu:            F12
+ * - Show/hide GUI:             Ctrl  + g
+ * - Search Parameter:          Ctrl  + p
+ * - Save Running Project:      Ctrl  + s
+ * - Quit Program:              Alt   + F4
+
+ * ----- Configurator -----
+ * - Search Module:             Ctrl + Shift + m
+ * - Search Parameter:          Ctrl + Shift + p
+ * - Save Edited Project:       Ctrl + Shift + s
+ * - Delete Graph Item:         Delete
+ *
+ **/
+
 #define IMGUI_DEFINE_MATH_OPERATORS
 #define IMGUI_DISABLE_OBSOLETE_FUNCTIONS
 #include "imgui.h"
@@ -229,14 +250,14 @@ namespace gui {
         ImGuiID group_hovered_uid;  // in out
         bool group_layout;          // out
 
-        UIDVector_t modules_selected_uids;             // in out
-        ImGuiID module_hovered_uid;                    // in out
-        UIDPairVector_t modules_add_group_uids;        // out
-        UIDVector_t modules_remove_group_uids;         // out
-        bool modules_layout;                           // out
-        StrPairVector_t module_rename;                 // out
-        vislib::math::Ternary module_mainview_changed; // out
-        ImVec2 module_param_child_position;            // out
+        UIDVector_t modules_selected_uids;               // in out
+        ImGuiID module_hovered_uid;                      // in out
+        UIDPairVector_t modules_add_group_uids;          // out
+        UIDVector_t modules_remove_group_uids;           // out
+        bool modules_layout;                             // out
+        StrPairVector_t module_rename;                   // out
+        vislib::math::Ternary module_graphentry_changed; // out
+        ImVec2 module_param_child_position;              // out
 
         ImGuiID call_selected_uid; // in out
         ImGuiID call_hovered_uid;  // in out