Skip to content

Commit 4212cab

Browse files
GUI improvements. WIP Blender icons added (TODO: investigate license and credit or remove these)
1 parent 9776c07 commit 4212cab

17 files changed

+280
-96
lines changed

data/config/defaultLayout.ini

+5-5
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ DockId=0x0000000C,0
4242
Pos=0,24
4343
Size=335,271
4444
Collapsed=0
45-
DockId=0x0000000D,1
45+
DockId=0x0000000D,2
4646

4747
[Window][###lights_window]
4848
Pos=0,24
@@ -87,10 +87,10 @@ Collapsed=0
8787
DockId=0x0000000E,0
8888

8989
[Window][ Materials##materials_window]
90-
Pos=0,297
91-
Size=335,404
90+
Pos=0,24
91+
Size=335,271
9292
Collapsed=0
93-
DockId=0x0000000E,1
93+
DockId=0x0000000D,1
9494

9595
[Window][Perf##perf_window]
9696
Pos=337,784
@@ -102,7 +102,7 @@ DockId=0x00000010,0
102102
Pos=0,297
103103
Size=335,404
104104
Collapsed=0
105-
DockId=0x0000000E,2
105+
DockId=0x0000000E,1
106106

107107
[Window][Scene Graph##scene_graph_window]
108108
Pos=0,24

data/textures/icons/curve.png

560 Bytes
Loading

data/textures/icons/ease_in_out.png

555 Bytes
Loading

data/textures/icons/histogram.png

464 Bytes
Loading

data/textures/icons/icon_camera.png

956 Bytes
Loading
821 Bytes
Loading
646 Bytes
Loading
553 Bytes
Loading

data/textures/icons/icon_object.png

653 Bytes
Loading

data/textures/icons/icon_rgb.png

494 Bytes
Loading

data/textures/icons/icon_sun.png

882 Bytes
Loading

data/textures/icons/particles.png

912 Bytes
Loading

src/FrogRenderer2.h

+9-2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "shaders/ShadeDeferredPbr.h.glsl"
2121

2222
#include <variant>
23+
#include <vector>
2324

2425
// TODO: these structs should come from shared headers rather than copying them
2526
FVOG_DECLARE_ARGUMENTS(VisbufferPushConstants)
@@ -670,7 +671,13 @@ class FrogRenderer2 final : public Application
670671
bool showFpsInfo = true;
671672
bool showSceneInfo = false;
672673
struct CameraSelected{};
673-
struct AtmosphereSelected{};
674-
using SelectedThingyType = std::variant<std::monostate, CameraSelected, AtmosphereSelected, Utility::Node*>;
674+
struct SunSelected{};
675+
struct MaterialSelected
676+
{
677+
size_t index;
678+
};
679+
using SelectedThingyType = std::variant<std::monostate, CameraSelected, SunSelected, Utility::Node*, MaterialSelected>;
675680
SelectedThingyType selectedThingy = std::monostate{};
681+
682+
std::unordered_map<std::string, Fvog::Texture> guiIcons;
676683
};

src/Fvog/Texture2.h

+5
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,11 @@ namespace Fvog
223223
return createInfo_;
224224
}
225225

226+
[[nodiscard]] bool operator==(const Texture& other) const noexcept
227+
{
228+
return image_ == other.image_;
229+
}
230+
226231
// TODO: Make layout per subresource and track it in the command buffer
227232
std::unique_ptr<VkImageLayout> currentLayout{};
228233

0 commit comments

Comments
 (0)