GUI improvements. WIP Blender icons added (TODO: investigate license …

…and credit or remove these)
JuanDiegoMontoya · Jul 6, 2024 · 4212cab · 4212cab
1 parent 9776c07
commit 4212cab
Show file tree

Hide file tree

Showing 17 changed files with 280 additions and 96 deletions.
diff --git a/data/config/defaultLayout.ini b/data/config/defaultLayout.ini
@@ -42,7 +42,7 @@ DockId=0x0000000C,0
 Pos=0,24
 Size=335,271
 Collapsed=0
-DockId=0x0000000D,1
+DockId=0x0000000D,2
 
 [Window][###lights_window]
 Pos=0,24
@@ -87,10 +87,10 @@ Collapsed=0
 DockId=0x0000000E,0
 
 [Window][ Materials##materials_window]
-Pos=0,297
-Size=335,404
+Pos=0,24
+Size=335,271
 Collapsed=0
-DockId=0x0000000E,1
+DockId=0x0000000D,1
 
 [Window][Perf##perf_window]
 Pos=337,784
@@ -102,7 +102,7 @@ DockId=0x00000010,0
 Pos=0,297
 Size=335,404
 Collapsed=0
-DockId=0x0000000E,2
+DockId=0x0000000E,1
 
 [Window][Scene Graph##scene_graph_window]
 Pos=0,24

diff --git a/data/textures/icons/curve.png b/data/textures/icons/curve.png
diff --git a/data/textures/icons/ease_in_out.png b/data/textures/icons/ease_in_out.png
diff --git a/data/textures/icons/histogram.png b/data/textures/icons/histogram.png
diff --git a/data/textures/icons/icon_camera.png b/data/textures/icons/icon_camera.png
diff --git a/data/textures/icons/icon_camera_flash.png b/data/textures/icons/icon_camera_flash.png
diff --git a/data/textures/icons/icon_chroma_scope.png b/data/textures/icons/icon_chroma_scope.png
diff --git a/data/textures/icons/icon_mesh_cube.png b/data/textures/icons/icon_mesh_cube.png
diff --git a/data/textures/icons/icon_object.png b/data/textures/icons/icon_object.png
diff --git a/data/textures/icons/icon_rgb.png b/data/textures/icons/icon_rgb.png
diff --git a/data/textures/icons/icon_sun.png b/data/textures/icons/icon_sun.png
diff --git a/data/textures/icons/particles.png b/data/textures/icons/particles.png
diff --git a/src/FrogRenderer2.h b/src/FrogRenderer2.h
@@ -20,6 +20,7 @@
 #include "shaders/ShadeDeferredPbr.h.glsl"
 
 #include <variant>
+#include <vector>
 
 // TODO: these structs should come from shared headers rather than copying them
 FVOG_DECLARE_ARGUMENTS(VisbufferPushConstants)
@@ -670,7 +671,13 @@ class FrogRenderer2 final : public Application
   bool showFpsInfo   = true;
   bool showSceneInfo = false;
   struct CameraSelected{};
-  struct AtmosphereSelected{};
-  using SelectedThingyType = std::variant<std::monostate, CameraSelected, AtmosphereSelected, Utility::Node*>;
+  struct SunSelected{};
+  struct MaterialSelected
+  {
+    size_t index;
+  };
+  using SelectedThingyType = std::variant<std::monostate, CameraSelected, SunSelected, Utility::Node*, MaterialSelected>;
   SelectedThingyType selectedThingy = std::monostate{};
+
+  std::unordered_map<std::string, Fvog::Texture> guiIcons;
 };
diff --git a/src/Fvog/Texture2.h b/src/Fvog/Texture2.h
@@ -223,6 +223,11 @@ namespace Fvog
       return createInfo_;
     }
 
+    [[nodiscard]] bool operator==(const Texture& other) const noexcept
+    {
+      return image_ == other.image_;
+    }
+
     // TODO: Make layout per subresource and track it in the command buffer
     std::unique_ptr<VkImageLayout> currentLayout{};