Qtfred Dockable object list (#7368)

* qtfred dockable objects list

* fix jumpnode rendering

* more ouline panel features

* fix for wings

* remember list expansions

* clean up wing selection and layer handling

* disable top and bottom docking

* give scene outliner some padding

* replace old selection dialog with the scene browser

* fix some minor issues

* right click for wings and waypoint paths

* clang

* clang again

* fix status bar message

* 25 1 checks

* clang

* more clang

* address feedback

Author: MjnMixael

code/jumpnode/jumpnode.cpp

@@ -71,13 +71,14 @@ CJumpNode::CJumpNode(const vec3d* position)
 }
 
 CJumpNode::CJumpNode(CJumpNode&& other) noexcept
-	: m_radius(other.m_radius), m_modelnum(other.m_modelnum), m_objnum(other.m_objnum), m_polymodel_instance_num(other.m_polymodel_instance_num), m_flags(other.m_flags)
+	: m_radius(other.m_radius), m_modelnum(other.m_modelnum), m_objnum(other.m_objnum), m_polymodel_instance_num(other.m_polymodel_instance_num), m_flags(other.m_flags), m_fred_layer(std::move(other.m_fred_layer))
 {
 	other.m_radius = 0.0f;
 	other.m_modelnum = -1;
 	other.m_objnum = -1;
 	other.m_polymodel_instance_num = -1;
 	other.m_flags = 0;
+	other.m_fred_layer = "Default";
 
 	m_display_color = other.m_display_color;
 	m_pos = other.m_pos;
@@ -95,12 +96,14 @@ CJumpNode& CJumpNode::operator=(CJumpNode&& other) noexcept
 		m_objnum = other.m_objnum;
 		m_flags = other.m_flags;
 		m_polymodel_instance_num = other.m_polymodel_instance_num;
+		m_fred_layer = std::move(other.m_fred_layer);
 
 		other.m_radius = 0.0f;
 		other.m_modelnum = -1;
 		other.m_objnum = -1;
 		other.m_flags = 0;
 		other.m_polymodel_instance_num = -1;
+		other.m_fred_layer = "Default";
 
 		m_display_color = other.m_display_color;
 		m_pos = other.m_pos;

code/jumpnode/jumpnode.h

@@ -15,6 +15,7 @@
 #include <cstdlib>
 
 #include "globalincs/globals.h"
+#include "globalincs/pstypes.h"
 #include "graphics/2d.h"
 
 struct vec3d;
@@ -45,6 +46,7 @@ class CJumpNode
 	int m_flags {0};
 	color m_display_color;			// Color node will be shown in (Default:0/255/0/255)
 	vec3d m_pos;
+	SCP_string m_fred_layer = "Default";	// FRED view layer assignment
 
 	CJumpNode(const CJumpNode&);
 	CJumpNode& operator=(const CJumpNode&) = delete;
@@ -76,6 +78,10 @@ class CJumpNode
 	void SetDisplayName(const char* new_name);
 	void SetVisibility(bool enabled);
 
+	//Getting/Setting FRED layer
+	const SCP_string& GetFredLayer() const { return m_fred_layer; }
+	void SetFredLayer(const SCP_string& layer) { m_fred_layer = layer; }
+
 	//Query
 	bool IsHidden() const;
 	bool IsColored() const;

code/mission/missionparse.cpp

@@ -5850,20 +5850,33 @@ void parse_waypoint_list(mission *pm)
 		stuff_int(&cb);
 	}
 
+	SCP_string wpt_fred_layer = "Default";
+	if (optional_string("+Layer:")) {
+		stuff_string(wpt_fred_layer, F_NAME);
+		if (!mission_has_layer_name(&The_mission, wpt_fred_layer)) {
+			if (wpt_fred_layer.empty()) {
+				wpt_fred_layer = "Default";
+			} else {
+				The_mission.fred_layers.push_back(wpt_fred_layer);
+			}
+		}
+	}
+
 	SCP_vector<vec3d> vec_list;
 	required_string("$List:");
 	stuff_vec3d_list(vec_list);
 
 	waypoint_add_list(name_buf, vec_list);
 
 	// Apply display properties to the list just added
-	if (no_draw_lines || has_custom_color) {
-		waypoint_list* wl = find_matching_waypoint_list(name_buf);
-		if (wl) {
+	waypoint_list* wl = find_matching_waypoint_list(name_buf);
+	if (wl) {
+		if (no_draw_lines || has_custom_color) {
 			wl->set_no_draw_lines(no_draw_lines);
 			if (has_custom_color)
 				wl->set_color(cr, cg, cb);
 		}
+		wl->set_fred_layer(wpt_fred_layer);
 	}
 }
 
@@ -5911,6 +5924,19 @@ void parse_waypoints_and_jumpnodes(mission *pm)
 			jnp.SetVisibility(!hide);
 		}
 
+		if (optional_string("+Layer:")) {
+			SCP_string layer_name;
+			stuff_string(layer_name, F_NAME);
+			if (!mission_has_layer_name(&The_mission, layer_name)) {
+				if (layer_name.empty()) {
+					layer_name = "Default";
+				} else {
+					The_mission.fred_layers.push_back(layer_name);
+				}
+			}
+			jnp.SetFredLayer(layer_name);
+		}
+
 		Jump_nodes.push_back(std::move(jnp));
 	}
 
@@ -9519,5 +9545,29 @@ bool check_for_24_3_data()
 
 bool check_for_25_1_data()
 {
-	return (count_items_with_value(Props) > 0);
+	if (count_items_with_value(Props) > 0)
+		return true;
+
+	constexpr auto defaultLayer = "Default";
+
+	for (const auto& so : list_range(&Ship_obj_list))
+	{
+		auto shipp = &Ships[Objects[so->objnum].instance];
+		if (!shipp->fred_layer.empty() && !lcase_equal(shipp->fred_layer, defaultLayer))
+			return true;
+	}
+
+	for (const auto& wl : Waypoint_lists)
+	{
+		if (wl.get_no_draw_lines() || wl.get_has_custom_color())
+			return true;
+		const auto& layer = wl.get_fred_layer();
+		if (!layer.empty() && !lcase_equal(layer, defaultLayer))
+			return true;
+	}
+
+	return std::any_of(Jump_nodes.begin(), Jump_nodes.end(), [defaultLayer](const auto& jn) {
+		const auto& layer = jn.GetFredLayer();
+		return !layer.empty() && !lcase_equal(layer, defaultLayer);
+	});
 }

code/missioneditor/missionsave.cpp

@@ -4099,7 +4099,7 @@ int Fred_mission_save::save_objects()
 
 		if (save_config.save_format != MissionFormat::RETAIL &&
 			!shipp->fred_layer.empty() &&
-			stricmp(shipp->fred_layer.c_str(), "Default") != 0) {
+			!lcase_equal(shipp->fred_layer, "Default")) {
 			if (optional_string_fred("+Layer:", "$Name:"))
 				parse_comments();
 			else
@@ -4855,6 +4855,15 @@ int Fred_mission_save::save_waypoints()
 				else
 					fout(" %s", "false");
 			}
+
+			const SCP_string& jn_layer = jnp->GetFredLayer();
+			if (!jn_layer.empty() && !lcase_equal(jn_layer, "Default")) {
+				if (optional_string_fred("+Layer:", "$Jump Node:"))
+					parse_comments();
+				else
+					fout("\n+Layer:");
+				fout(" %s", jn_layer.c_str());
+			}
 		}
 
 		fso_comment_pop();
@@ -4886,6 +4895,15 @@ int Fred_mission_save::save_waypoints()
 				}
 				fout(" %d %d %d", ii.get_color_r(), ii.get_color_g(), ii.get_color_b());
 			}
+
+			const SCP_string& wpt_layer = ii.get_fred_layer();
+			if (!wpt_layer.empty() && !lcase_equal(wpt_layer, "Default")) {
+				if (optional_string_fred("+Layer:", "$List:"))
+					parse_comments();
+				else
+					fout("\n+Layer:");
+				fout(" %s", wpt_layer.c_str());
+			}
 		}
 
 		required_string_fred("$List:");
@@ -5233,7 +5251,7 @@ int Fred_mission_save::save_props()
 
 				if (save_config.save_format != MissionFormat::RETAIL &&
 					!p->fred_layer.empty() &&
-					stricmp(p->fred_layer.c_str(), "Default") != 0) {
+					!lcase_equal(p->fred_layer, "Default")) {
 					if (optional_string_fred("+Layer:", "$Name:"))
 						parse_comments();
 					else

code/object/waypoint.h

@@ -49,20 +49,23 @@ class waypoint_list
 		void set_no_draw_lines(bool val);
 		void set_color(int r, int g, int b);
 		void clear_color();
+		void set_fred_layer(const SCP_string& layer) { m_fred_layer = layer; }
 
 		// display property accessors
 		bool get_no_draw_lines() const;
 		bool get_has_custom_color() const;
 		int get_color_r() const;
 		int get_color_g() const;
 		int get_color_b() const;
+		const SCP_string& get_fred_layer() const { return m_fred_layer; }
 
 	private:
 		char m_name[NAME_LENGTH];
 		SCP_vector<waypoint> m_waypoints;
 		bool m_no_draw_lines;
 		bool m_has_custom_color;
 		int m_color_r, m_color_g, m_color_b;
+		SCP_string m_fred_layer = "Default";	// FRED view layer assignment
 };
 
 //********************GLOBALS********************

qtfred/source_groups.cmake

@@ -38,6 +38,8 @@ add_file_folder("Source/Mission"
 add_file_folder("Source/Mission/Dialogs"
     src/mission/dialogs/AbstractDialogModel.cpp
     src/mission/dialogs/AbstractDialogModel.h
+	src/mission/dialogs/SceneBrowserModel.cpp
+	src/mission/dialogs/SceneBrowserModel.h
 	src/mission/dialogs/AboutDialogModel.cpp
 	src/mission/dialogs/AboutDialogModel.h
 	src/mission/dialogs/AsteroidEditorDialogModel.cpp
@@ -84,8 +86,6 @@ add_file_folder("Source/Mission/Dialogs"
 	src/mission/dialogs/ReinforcementsEditorDialogModel.h
 	src/mission/dialogs/RelativeCoordinatesDialogModel.cpp
 	src/mission/dialogs/RelativeCoordinatesDialogModel.h
-	src/mission/dialogs/SelectionDialogModel.cpp
-	src/mission/dialogs/SelectionDialogModel.h
 	src/mission/dialogs/ShieldSystemDialogModel.cpp
 	src/mission/dialogs/ShieldSystemDialogModel.h
 	src/mission/dialogs/TeamLoadoutDialogModel.cpp
@@ -196,8 +196,6 @@ add_file_folder("Source/UI/Dialogs"
 	src/ui/dialogs/RelativeCoordinatesDialog.h
 	src/ui/dialogs/SaveAsTemplateDialog.cpp
 	src/ui/dialogs/SaveAsTemplateDialog.h
-	src/ui/dialogs/SelectionDialog.cpp
-	src/ui/dialogs/SelectionDialog.h
 	src/ui/dialogs/ShieldSystemDialog.h
 	src/ui/dialogs/ShieldSystemDialog.cpp
 	src/ui/dialogs/TableViewerDialog.cpp
@@ -270,6 +268,13 @@ add_file_folder("Source/UI/General"
 	src/ui/dialogs/General/ImagePickerDialog.h
 )
 
+add_file_folder("Source/UI/Panels"
+	src/ui/panels/FlowLayout.cpp
+	src/ui/panels/FlowLayout.h
+	src/ui/panels/SceneBrowserPanel.cpp
+	src/ui/panels/SceneBrowserPanel.h
+)
+
 add_file_folder("Source/UI/Util"
 	src/ui/util/default_dir.cpp
 	src/ui/util/default_dir.h
@@ -346,7 +351,6 @@ add_file_folder("UI"
 	ui/PropEditorDialog.ui
 	ui/ReinforcementsDialog.ui
 	ui/RelativeCoordinatesDialog.ui
-	ui/SelectionDialog.ui
 	ui/ShieldSystemDialog.ui
 	ui/SoundEnvironmentDialog.ui
 	ui/TableViewerDialog.ui
@@ -366,6 +370,7 @@ add_file_folder("UI"
 	ui/VariableDialog.ui
 	ui/WingEditorDialog.ui
 	ui/SaveAsTemplateDialog.ui
+	ui/SceneBrowserPanel.ui
 	ui/TemplateBrowserDialog.ui
 )
 

qtfred/src/mission/Editor.cpp

@@ -1236,14 +1236,14 @@ int Editor::common_object_delete(int obj) {
 	//this causes an ugly crash.
 	obj_delete(obj);
 
-	missionChanged();
 	return 0;
 }
 
 int Editor::delete_object(int obj) {
 	int r;
 
 	r = common_object_delete(obj);
+	missionChanged();
 	return r;
 }
 

qtfred/src/mission/Editor.h

@@ -114,6 +114,12 @@ class Editor : public QObject {
 	/*! Update the game but doesn't render anything. */
 	void update();
 
+	/*! Emit layerVisibilityChanged — called by EditorViewport after toggling a layer. */
+	void notifyLayerVisibilityChanged() { layerVisibilityChanged(); }
+
+	/*! Emit layerStructureChanged — called by EditorViewport when layers are added/removed or objects move between layers. */
+	void notifyLayerStructureChanged() { layerStructureChanged(); }
+
   signals:
 	/**
 	 * @brief Signal for when a new mission has been loaded
@@ -139,6 +145,16 @@ class Editor : public QObject {
 	 */
 	void objectMarkingChanged(int obj, bool marked);
 
+	/**
+	 * @brief A signal emitted when a layer's visibility has been toggled
+	 */
+	void layerVisibilityChanged();
+
+	/**
+	 * @brief A signal emitted when the layer list changes (add/remove) or an object moves between layers
+	 */
+	void layerStructureChanged();
+
   public:
 	// --- Undo / autosave state ---
 	int undoAvailable = 0;    ///< Whether an undo state (Backup.002) is available