QtFRED Cleanup and parity pass on view and object menus (scp-fs2open#7348)

* Cleanup and parity pass on view and object menus

* some more view menu cleanup

* fix outline rendering for ships

* clang

Author: MjnMixael

code/model/model.h

@@ -1070,7 +1070,7 @@ constexpr uint64_t MR_NO_INSIGNIA = static_cast<uint64_t>(1) << static_cast<uint
 #define MR_DEBUG_PATHS				(1<<1)		// Show the paths associated with a model
 #define MR_DEBUG_RADIUS				(1<<2)		// Show the radius around the object
 #define MR_DEBUG_SHIELDS			(1<<3)		// Show the shield mesh
-#define MR_DEBUG_BAY_PATHS			(1<<4)		// draw bay paths
+#define MR_DEBUG_BAY_PATHS			(1<<4)		// draw fighter bay paths
 #define MR_DEBUG_NO_DIFFUSE			(1<<5)
 #define MR_DEBUG_NO_SPEC			(1<<6)
 #define MR_DEBUG_NO_NORMAL			(1<<7)
@@ -1080,6 +1080,7 @@ constexpr uint64_t MR_NO_INSIGNIA = static_cast<uint64_t>(1) << static_cast<uint
 #define MR_DEBUG_NO_AMBIENT			(1<<11)
 #define MR_DEBUG_NO_MISC			(1<<12)
 #define MR_DEBUG_NO_REFLECT			(1<<13)
+#define MR_DEBUG_DOCK_POINTS		(1<<14)		// draw docking bay slot positions and normals
 
 //Defines for the render parameter of model_render, model_really_render and model_render_buffers
 #define MODEL_RENDER_OPAQUE 1
@@ -1471,6 +1472,8 @@ void model_draw_paths_htl( int model_num, uint64_t flags );
 
 void model_draw_bay_paths_htl(int model_num);
 
+void model_draw_dock_points_htl(int model_num);
+
 bool model_interp_config_buffer(indexed_vertex_source *vert_src, vertex_buffer *vb, bool update_ibuffer_only);
 bool model_interp_pack_buffer(indexed_vertex_source *vert_src, vertex_buffer *vb);
 void model_interp_submit_buffers(indexed_vertex_source *vert_src, size_t vertex_stride);

code/model/modelinterp.cpp

@@ -671,7 +671,7 @@ void model_draw_paths_htl( int model_num, uint64_t flags )
 }
 
 /**
- * Docking bay and fighter bay paths
+ * Fighter bay approach/departure paths (paths named $bayN)
  */
 void model_draw_bay_paths_htl(int model_num)
 {
@@ -684,6 +684,40 @@ void model_draw_bay_paths_htl(int model_num)
 	}
 
 	int cull = gr_set_cull(0);
+
+	// render fighter bay paths
+	gr_set_color(0, 255, 255);
+
+	// iterate through the paths that exist in the polymodel, searching for $bayN pathnames
+	for (idx = 0; idx<pm->n_paths; idx++) {
+		if ( !strnicmp(pm->paths[idx].name, NOX("$bay"), 4) ) {
+			for(s_idx=0; s_idx<pm->paths[idx].nverts-1; s_idx++){
+				v1 = pm->paths[idx].verts[s_idx].pos;
+				v2 = pm->paths[idx].verts[s_idx+1].pos;
+
+				g3_render_line_3d(true, &v1, &v2);
+			}
+		}
+	}
+
+	gr_set_cull(cull);
+}
+
+/**
+ * Docking bay slot positions and normals
+ */
+void model_draw_dock_points_htl(int model_num)
+{
+	int idx, s_idx;
+	vec3d v1, v2;
+
+	polymodel *pm = model_get(model_num);
+	if(pm == nullptr){
+		return;
+	}
+
+	int cull = gr_set_cull(0);
+
 	// render docking bay normals
 	gr_set_color(0, 255, 0);
 	for(idx=0; idx<pm->n_docks; idx++){
@@ -693,27 +727,10 @@ void model_draw_bay_paths_htl(int model_num)
 
 			// draw the point and normal
 			g3_render_sphere(&v1, 2.0);
-			//g3_draw_htl_line(&v1, &v2);
 			g3_render_line_3d(true, &v1, &v2);
 		}
 	}
 
-	// render figher bay paths
-	gr_set_color(0, 255, 255);
-		
-	// iterate through the paths that exist in the polymodel, searching for $bayN pathnames
-	for (idx = 0; idx<pm->n_paths; idx++) {
-		if ( !strnicmp(pm->paths[idx].name, NOX("$bay"), 4) ) {						
-			for(s_idx=0; s_idx<pm->paths[idx].nverts-1; s_idx++){
-				v1 = pm->paths[idx].verts[s_idx].pos;
-				v2 = pm->paths[idx].verts[s_idx+1].pos;
-
-				//g3_draw_htl_line(&v1, &v2);
-				g3_render_line_3d(true, &v1, &v2);
-			}
-		}
-	}	
-
 	gr_set_cull(cull);
 }
 

code/model/modelrender.cpp

@@ -2618,6 +2618,10 @@ void model_render_debug(int model_num, const matrix *orient, const vec3d *pos, u
 		model_draw_bay_paths_htl(model_num);
 	}
 
+	if ( debug_flags & MR_DEBUG_DOCK_POINTS ) {
+		model_draw_dock_points_htl(model_num);
+	}
+
 	if ( (flags & MR_AUTOCENTER) && (set_autocen) ) {
 		g3_done_instance(true);
 	}

fred2/fredrender.cpp

@@ -1905,7 +1905,7 @@ void render_one_model_htl(object *objp) {
 		uint64_t flags = MR_NORMAL;
 
 		if (Show_dock_points) {
-			debug_flags |= MR_DEBUG_BAY_PATHS;
+			debug_flags |= MR_DEBUG_BAY_PATHS | MR_DEBUG_DOCK_POINTS;
 		}
 
 		if (Show_paths_fred) {

qtfred/source_groups.cmake

@@ -60,6 +60,8 @@ add_file_folder("Source/Mission/Dialogs"
 	src/mission/dialogs/GlobalShipFlagsDialogModel.h
 	src/mission/dialogs/JumpNodeEditorDialogModel.cpp
 	src/mission/dialogs/JumpNodeEditorDialogModel.h
+	src/mission/dialogs/LayerManagerDialogModel.cpp
+	src/mission/dialogs/LayerManagerDialogModel.h
 	src/mission/dialogs/MissionCutscenesDialogModel.cpp
 	src/mission/dialogs/MissionCutscenesDialogModel.h
 	src/mission/dialogs/MissionEventsDialogModel.cpp
@@ -315,6 +317,7 @@ add_file_folder("UI"
     ui/FredView.ui
 	ui/GlobalShipFlagsDialog.ui
 	ui/JumpNodeEditorDialog.ui
+	ui/LayerManagerDialog.ui
 	ui/TeamLoadoutDialog.ui
 	ui/MissionCutscenesDialog.ui
 	ui/MissionEventsDialog.ui

qtfred/src/mission/Editor.cpp

@@ -1978,6 +1978,74 @@ void Editor::cancel_select_subsystem() {
 	Render_subsys.cur_subsys = NULL;
 	updateAllViewports();
 }
+void Editor::select_next_object()
+{
+	object* ptr;
+
+	if (EMPTY(&obj_used_list))
+		return;
+
+	if (query_valid_object(currentObject)) {
+		ptr = Objects[currentObject].next;
+		if (ptr == END_OF_LIST(&obj_used_list))
+			ptr = GET_NEXT(ptr);
+	} else {
+		ptr = GET_FIRST(&obj_used_list);
+	}
+
+	if (getNumMarked() > 1) {
+		// Cycle current object through marked objects only
+		while (!Objects[OBJ_INDEX(ptr)].flags[Object::Object_Flags::Marked]) {
+			ptr = GET_NEXT(ptr);
+			if (ptr == END_OF_LIST(&obj_used_list))
+				ptr = GET_NEXT(ptr);
+		}
+		setupCurrentObjectIndices(OBJ_INDEX(ptr));
+	} else {
+		if (getNumMarked())
+			unmarkObject(currentObject);
+		markObject(OBJ_INDEX(ptr));
+	}
+}
+void Editor::select_previous_object()
+{
+	int arr[MAX_OBJECTS], i = 0, n = 0;
+	object* ptr;
+
+	if (EMPTY(&obj_used_list))
+		return;
+
+	ptr = GET_FIRST(&obj_used_list);
+	while (ptr != END_OF_LIST(&obj_used_list)) {
+		if (currentObject == OBJ_INDEX(ptr))
+			i = n;
+		arr[n++] = OBJ_INDEX(ptr);
+		ptr = GET_NEXT(ptr);
+	}
+
+	Assert(n);
+	if (query_valid_object(currentObject)) {
+		i--;
+		if (i < 0)
+			i = n - 1;
+	} else {
+		i = n - 1;
+	}
+
+	if (getNumMarked() > 1) {
+		// Cycle current object through marked objects only
+		while (!Objects[arr[i]].flags[Object::Object_Flags::Marked]) {
+			i--;
+			if (i < 0)
+				i = n - 1;
+		}
+		setupCurrentObjectIndices(arr[i]);
+	} else {
+		if (getNumMarked())
+			unmarkObject(currentObject);
+		markObject(arr[i]);
+	}
+}
 int Editor::get_visible_sub_system_count(ship * shipp) {
 	int count = 0;
 	ship_subsys* cur_subsys;

qtfred/src/mission/Editor.h

@@ -230,6 +230,9 @@ class Editor : public QObject {
 	void select_previous_subsystem();
 	void cancel_select_subsystem();
 
+	void select_next_object();
+	void select_previous_object();
+
 	bool global_error_check();
 
 	SCP_vector<SCP_string> get_docking_list(int model_index);

qtfred/src/mission/EditorViewport.h

@@ -16,14 +16,13 @@ struct ViewSettings {
 	bool Show_horizon = false;
 	bool Show_grid = true;
 	bool Show_distances = true;
-	bool Show_asteroid_field = true;
-	bool Aa_gridlines = false;
 	bool Show_coordinates = false;
 	bool Show_outlines = false;
 	bool Draw_outlines_on_selected_ships = true;
 	bool Draw_outline_at_warpin_position = false;
 	bool Show_grid_positions = true;
 	bool Show_dock_points = false;
+	bool Show_bay_paths = false;
 	bool Show_starts = true;
 	bool Show_ships = true;
 	SCP_vector<bool> Show_iff;

qtfred/src/mission/FredRenderer.cpp

@@ -79,8 +79,6 @@ void init_fred_colors() {
 int grid_colors_inited = 0;
 color Fred_grid_bright;
 color Fred_grid_dark;
-color Fred_grid_bright_aa;
-color Fred_grid_dark_aa;
 
 void draw_asteroid_field() {
 	int i, j;
@@ -327,24 +325,13 @@ void FredRenderer::render_grid(grid* gridp) {
 	if (!grid_colors_inited) {
 		grid_colors_inited = 1;
 
-		gr_init_alphacolor(&Fred_grid_dark_aa, 64, 64, 64, 255);
-		gr_init_alphacolor(&Fred_grid_bright_aa, 128, 128, 128, 255);
 		gr_init_color(&Fred_grid_dark, 64, 64, 64);
 		gr_init_color(&Fred_grid_bright, 128, 128, 128);
 	}
 
 	ncols = gridp->ncols;
 	nrows = gridp->nrows;
-	if (double_fine_gridlines) {
-		ncols *= 2;
-		nrows *= 2;
-	}
-
-	if (view().Aa_gridlines) {
-		gr_set_color_fast(&Fred_grid_dark_aa);
-	} else {
-		gr_set_color_fast(&Fred_grid_dark);
-	}
+	gr_set_color_fast(&Fred_grid_dark);
 
 	//	Draw the column lines.
 	for (i = 0; i <= ncols; i++) {
@@ -359,11 +346,7 @@ void FredRenderer::render_grid(grid* gridp) {
 	nrows = gridp->nrows / 2;
 
 	// now draw the larger, brighter gridlines that is x10 the scale of smaller one.
-	if (view().Aa_gridlines) {
-		gr_set_color_fast(&Fred_grid_bright_aa);
-	} else {
-		gr_set_color_fast(&Fred_grid_bright);
-	}
+	gr_set_color_fast(&Fred_grid_bright);
 
 	for (i = 0; i <= ncols; i++) {
 		g3_draw_htl_line(&gridp->gpoints5[i], &gridp->gpoints6[i]);
@@ -905,6 +888,10 @@ void FredRenderer::render_one_model_htl(object* objp,
 
 		uint debug_flags = 0;
 		if (view().Show_dock_points) {
+			debug_flags |= MR_DEBUG_DOCK_POINTS;
+		}
+
+		if (view().Show_bay_paths) {
 			debug_flags |= MR_DEBUG_BAY_PATHS;
 		}
 
@@ -924,21 +911,27 @@ void FredRenderer::render_one_model_htl(object* objp,
 			flags |= MR_FULL_DETAIL;
 		}
 
+		g3_done_instance(false);
+
+		// Outline pass: use a dedicated pass with MR_NO_POLYS so is_outlines_only_htl fires
+		// in the renderer. Modern HTL models don't have outline_buffer, so relying on
+		// MR_SHOW_OUTLINE_HTL alone (without MR_NO_POLYS) silently does nothing.
 		if (Fred_outline) {
-			flags |= MR_SHOW_OUTLINE_HTL;
+			model_render_params outline_info;
+			outline_info.set_color(Fred_outline >> 16, (Fred_outline >> 8) & 0xff, Fred_outline & 0xff);
+			outline_info.set_flags(flags | MR_SHOW_OUTLINE_HTL | MR_NO_POLYS | MR_NO_LIGHTING | MR_NO_TEXTURING);
+			model_render_immediate(&outline_info, Ship_info[Ships[z].ship_info_index].model_num, Ships[z].model_instance_num, &objp->orient, &objp->pos);
 		}
 
-		model_render_params render_info;
-		render_info.set_debug_flags(debug_flags);
-		render_info.set_color(Fred_outline >> 16, (Fred_outline >> 8) & 0xff, Fred_outline & 0xff);
-		render_info.set_replacement_textures(model_get_instance(Ships[z].model_instance_num)->texture_replace);
-		render_info.set_flags(flags);
-
-		g3_done_instance(0);
-
-		model_render_immediate(&render_info, Ship_info[Ships[z].ship_info_index].model_num, Ships[z].model_instance_num, &objp->orient, &objp->pos);
+		if (view().Show_ship_models) {
+			model_render_params render_info;
+			render_info.set_debug_flags(debug_flags);
+			render_info.set_replacement_textures(model_get_instance(Ships[z].model_instance_num)->texture_replace);
+			render_info.set_flags(flags);
+			model_render_immediate(&render_info, Ship_info[Ships[z].ship_info_index].model_num, Ships[z].model_instance_num, &objp->orient, &objp->pos);
+		}
 
-		if (view().Draw_outline_at_warpin_position 
+		if (view().Draw_outline_at_warpin_position
 			&& (Ships[z].arrival_cue != Locked_sexp_true || Ships[z].arrival_delay > 0)
 			&& Ships[z].arrival_cue != Locked_sexp_false
 			&& !Ships[z].flags[Ship::Ship_Flags::No_arrival_warp])
@@ -951,9 +944,10 @@ void FredRenderer::render_one_model_htl(object* objp,
 				vec3d warpin_pos;
 				vm_vec_scale_add(&warpin_pos, &objp->pos, &objp->orient.vec.fvec, warpin_dist);
 
-				render_info.set_color(65, 65, 65);	// grey; see rgba_defaults
-				render_info.set_flags(flags | MR_SHOW_OUTLINE_HTL | MR_NO_LIGHTING | MR_NO_POLYS | MR_NO_TEXTURING);
-				model_render_immediate(&render_info, Ship_info[Ships[z].ship_info_index].model_num, Ships[z].model_instance_num, &objp->orient, &warpin_pos);
+				model_render_params warpin_info;
+				warpin_info.set_color(65, 65, 65);	// grey; see rgba_defaults
+				warpin_info.set_flags(flags | MR_SHOW_OUTLINE_HTL | MR_NO_LIGHTING | MR_NO_POLYS | MR_NO_TEXTURING);
+				model_render_immediate(&warpin_info, Ship_info[Ships[z].ship_info_index].model_num, Ships[z].model_instance_num, &objp->orient, &warpin_pos);
 			}
 		}
 	} else {
@@ -1146,10 +1140,8 @@ void FredRenderer::render_frame(int cur_object_index,
 		g3_draw_horizon_line();
 	}
 
-	if (view().Show_asteroid_field) {
-		gr_set_color(192, 96, 16);
-		draw_asteroid_field();
-	}
+	gr_set_color(192, 96, 16);
+	draw_asteroid_field();
 
 	if (view().Show_grid) {
 		render_grid(_viewport->The_grid);

qtfred/src/mission/FredRenderer.h

@@ -15,9 +15,9 @@ class ship_subsys;
 
 ///! \fixme This does NOT belong here. Used for porting and testing purposes ONLY!
 struct subsys_to_render {
-	bool do_render;
-	object* ship_obj;
-	ship_subsys* cur_subsys;
+	bool do_render = false;
+	object* ship_obj = nullptr;
+	ship_subsys* cur_subsys = nullptr;
 };
 
 ///! \fixme does NOT belong here.