Skip to content

Commit 6311145

Browse files
Astral-CAstral-C
committed
UI touchups
1 parent e30e8a8 commit 6311145

23 files changed

+444
-133
lines changed

‎include/DOM/BooDOMNode.hpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ class LBooDOMNode : public LEntityDOMNode
2222

2323
LBooDOMNode(std::string name);
2424

25+
int32_t GetInitialRoom() { return mInitialRoom; }
26+
2527
virtual void RenderDetailsUI(float dt) override;
2628

2729
// Writes the data this JMP node into the given LJmpIO instance at the specified entry.

‎include/DOM/DoorDOMNode.hpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ class LDoorDOMNode : public LBGRenderDOMNode
6969

7070
void AssignJmpIdAndIndex(std::vector<std::shared_ptr<LDoorDOMNode>> doors);
7171
bool HasRoomReference(std::shared_ptr<LRoomDOMNode> room);
72+
std::pair<std::shared_ptr<LRoomDOMNode>, std::shared_ptr<LRoomDOMNode>> GetRoomReferences() { return { mWestSouthRoom.lock(), mEastNorthRoom.lock() }; }
7273

7374
int32_t GetJmpId() const { return mJmpId; }
7475
int32_t GetIndex() const { return mDoorEntryNumber; }

‎include/io/PrmIO.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ class LPrmIO {
9292
void SaveConfigsToFile();
9393
void Load(std::string name, bStream::CStream* stream);
9494
void Save(std::string name, bStream::CStream* stream);
95-
void RenderUI();
95+
bool RenderUI();
9696

9797
LPrmIO();
9898
~LPrmIO();

‎include/modes/ActorMode.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ extern bool isRoomDirty;
77
class LActorMode : public LEditorModeBase
88
{
99

10-
void RenderSceneHierarchy(std::shared_ptr<LMapDOMNode> current_map);
10+
void RenderSceneHierarchy(std::shared_ptr<LMapDOMNode> current_map, EEditorMode& mode);
1111
void RenderDetailsWindow();
1212
std::weak_ptr<LRoomDOMNode> mManualRoomSelect;
1313

@@ -16,7 +16,7 @@ class LActorMode : public LEditorModeBase
1616
public:
1717
LActorMode();
1818

19-
virtual void Render(std::shared_ptr<LMapDOMNode> current_map, LEditorScene* renderer_scene) override;
19+
virtual void Render(std::shared_ptr<LMapDOMNode> current_map, LEditorScene* renderer_scene, EEditorMode& mode) override;
2020
virtual void RenderGizmo(LEditorScene* renderer_scene) override;
2121

2222
// Called when this mode becomes the active (currently interactable) mode.

‎include/modes/BooMode.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66

77
class LBooMode : public LEditorModeBase
88
{
9-
void RenderSceneHierarchy(std::shared_ptr<LMapDOMNode> current_map);
9+
void RenderSceneHierarchy(std::shared_ptr<LMapDOMNode> current_map, EEditorMode& mode);
1010
void RenderDetailsWindow();
1111

1212
public:
1313
LBooMode();
1414

15-
virtual void Render(std::shared_ptr<LMapDOMNode> current_map, LEditorScene* renderer_scene) override;
15+
virtual void Render(std::shared_ptr<LMapDOMNode> current_map, LEditorScene* renderer_scene, EEditorMode& mode) override;
1616
virtual void RenderGizmo(LEditorScene* renderer_scene) override;
1717

1818
// Called when this mode becomes the active (currently interactable) mode.

‎include/modes/DoorMode.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66

77
class LDoorMode : public LEditorModeBase
88
{
9-
void RenderSceneHierarchy(std::shared_ptr<LMapDOMNode> current_map);
9+
void RenderSceneHierarchy(std::shared_ptr<LMapDOMNode> current_map, EEditorMode& mode);
1010
void RenderDetailsWindow();
1111

1212
public:
1313
LDoorMode();
1414

1515
void RenderLeafContextMenu(std::shared_ptr<LDoorDOMNode> node);
1616

17-
virtual void Render(std::shared_ptr<LMapDOMNode> current_map, LEditorScene* renderer_scene) override;
17+
virtual void Render(std::shared_ptr<LMapDOMNode> current_map, LEditorScene* renderer_scene, EEditorMode& mode) override;
1818
virtual void RenderGizmo(LEditorScene* renderer_scene) override;
1919

2020
// Called when this mode becomes the active (currently interactable) mode.

‎include/modes/EditorModeBase.hpp‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,17 @@
66
#include "history/EditorHistory.hpp"
77
#include "ImGuizmo.h"
88

9+
enum class EEditorMode : uint32_t
10+
{
11+
Actor_Mode,
12+
Enemy_Mode,
13+
Door_Mode,
14+
Path_Mode,
15+
Item_Mode,
16+
Event_Mode,
17+
Boo_Mode
18+
};
19+
920
class LEditorModeBase
1021
{
1122
protected:
@@ -21,7 +32,7 @@ class LEditorModeBase
2132
// The Gizmo's current operation mode (translate, rotate, scale)
2233
ImGuizmo::OPERATION mGizmoMode { ImGuizmo::OPERATION::TRANSLATE };
2334

24-
virtual void Render(std::shared_ptr<LMapDOMNode> current_map, LEditorScene* renderer_scene) = 0;
35+
virtual void Render(std::shared_ptr<LMapDOMNode> current_map, LEditorScene* renderer_scene, EEditorMode& mode) = 0;
2536

2637
virtual void RenderGizmo(LEditorScene* renderer_scene) = 0;
2738

‎include/modes/EnemyMode.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
class LEnemyMode : public LEditorModeBase
66
{
7-
void RenderSceneHierarchy(std::shared_ptr<LMapDOMNode> current_map);
7+
void RenderSceneHierarchy(std::shared_ptr<LMapDOMNode> current_map, EEditorMode& mode);
88
void RenderDetailsWindow();
99

1010
public:
11-
virtual void Render(std::shared_ptr<LMapDOMNode> current_map, LEditorScene* renderer_scene) override;
11+
virtual void Render(std::shared_ptr<LMapDOMNode> current_map, LEditorScene* renderer_scene, EEditorMode& mode) override;
1212
virtual void RenderGizmo(LEditorScene* renderer_scene) override;
1313

1414
// Called when this mode becomes the active (currently interactable) mode.

‎include/modes/EventMode.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
class LEventMode : public LEditorModeBase
99
{
10-
void RenderSceneHierarchy(std::shared_ptr<LMapDOMNode> current_map);
10+
void RenderSceneHierarchy(std::shared_ptr<LMapDOMNode> current_map, EEditorMode& mode);
1111
void RenderDetailsWindow(LSceneCamera* camera);
1212

1313
TextEditor mEditorScript;
@@ -21,7 +21,7 @@ class LEventMode : public LEditorModeBase
2121

2222
void RenderLeafContextMenu(std::shared_ptr<LDoorDOMNode> node);
2323

24-
virtual void Render(std::shared_ptr<LMapDOMNode> current_map, LEditorScene* renderer_scene) override;
24+
virtual void Render(std::shared_ptr<LMapDOMNode> current_map, LEditorScene* renderer_scene, EEditorMode& mode) override;
2525
virtual void RenderGizmo(LEditorScene* renderer_scene) override;
2626

2727
// Called when this mode becomes the active (currently interactable) mode.

‎include/modes/ItemMode.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class LItemFishingDOMNode;
1010

1111
class LItemMode : public LEditorModeBase
1212
{
13-
void RenderSceneHierarchy(std::shared_ptr<LMapDOMNode> current_map);
13+
void RenderSceneHierarchy(std::shared_ptr<LMapDOMNode> current_map, EEditorMode& mode);
1414
void RenderDetailsWindow();
1515

1616
template<typename T>
@@ -33,7 +33,7 @@ class LItemMode : public LEditorModeBase
3333
public:
3434
LItemMode();
3535

36-
virtual void Render(std::shared_ptr<LMapDOMNode> current_map, LEditorScene* renderer_scene) override;
36+
virtual void Render(std::shared_ptr<LMapDOMNode> current_map, LEditorScene* renderer_scene, EEditorMode& mode) override;
3737
virtual void RenderGizmo(LEditorScene* renderer_scene) override;
3838

3939
// Called when this mode becomes the active (currently interactable) mode.

0 commit comments

Comments
 (0)