Sort props by category

Author: MjnMixael

code/lab/dialogs/lab_ui.cpp

@@ -93,6 +93,32 @@ void LabUi::build_weapon_subtype_list() const
 	}
 }
 
+void LabUi::build_prop_subtype_list() const
+{
+	for (size_t i = 0; i < Prop_categories.size(); i++) {
+		with_TreeNode(Prop_categories[i].name.c_str())
+		{
+			int prop_idx = 0;
+
+			for (auto const& class_def : Prop_info) {
+				if (lcase_equal(class_def.category, Prop_categories[i].name)) {
+					SCP_string node_label;
+					sprintf(node_label, "##PropClassIndex%i", prop_idx);
+					TreeNodeEx(node_label.c_str(),
+						ImGuiTreeNodeFlags_Leaf | ImGuiTreeNodeFlags_NoTreePushOnOpen,
+						"%s",
+						class_def.name.c_str());
+
+					if (IsItemClicked() && !IsItemToggledOpen()) {
+						getLabManager()->changeDisplayedObject(LabMode::Prop, prop_idx);
+					}
+				}
+				prop_idx++;
+			}
+		}
+	}
+}
+
 void LabUi::build_asteroid_list()
 {
 	with_TreeNode("Asteroids")
@@ -178,24 +204,11 @@ void LabUi::build_object_list()
 	}
 }
 
-void LabUi::build_prop_list()
+void LabUi::build_prop_list() const
 {
 	with_TreeNode("Prop Classes")
 	{
-		int prop_info_idx = 0;
-
-		for (auto const& class_def : Prop_info) {
-			SCP_string node_label;
-			sprintf(node_label, "##PropClassIndex%i", prop_info_idx);
-			TreeNodeEx(node_label.c_str(),
-				ImGuiTreeNodeFlags_Leaf | ImGuiTreeNodeFlags_NoTreePushOnOpen,
-				"%s",
-				class_def.name);
-			if (IsItemClicked() && !IsItemToggledOpen()) {
-				getLabManager()->changeDisplayedObject(LabMode::Prop, prop_info_idx);
-			}
-			prop_info_idx++;
-		}
+		build_prop_subtype_list();
 	}
 }
 
@@ -300,9 +313,9 @@ void LabUi::show_object_selector() const
 
 			build_weapon_list();
 
-			build_object_list();
-
 			build_prop_list();
+
+			build_object_list();
 		}
 	}
 }

code/lab/dialogs/lab_ui.h

@@ -27,7 +27,8 @@ class LabUi {
 	static void build_object_list();
 	static void build_asteroid_list();
 	static void build_debris_list();
-	static void build_prop_list();
+	void build_prop_list() const;
+	void build_prop_subtype_list() const;
 	void build_background_list() const;
 	void show_render_options();
 	void show_object_options() const;

code/lab/dialogs/lab_ui_helpers.cpp

@@ -436,7 +436,7 @@ SCP_string get_prop_table_text(const prop_info* pip)
 			while (line2[i] == ' ' || line2[i] == '\t' || line2[i] == '@')
 				i++;
 
-			if (!stricmp(line2 + i, pip->name)) {
+			if (!stricmp(line2 + i, pip->name.c_str())) {
 				result += "-- props.tbl -------------------------------\r\n";
 				found = 1;
 			}
@@ -494,7 +494,7 @@ SCP_string get_prop_table_text(const prop_info* pip)
 				while (line2[i] == ' ' || line2[i] == '\t' || line2[i] == '@')
 					i++;
 
-				if (!stricmp(line2 + i, pip->name)) {
+				if (!stricmp(line2 + i, pip->name.c_str())) {
 					memset(file_text, 0, sizeof(file_text));
 					snprintf(file_text,
 						sizeof(file_text) - 1,

code/mission/missionparse.cpp

@@ -5081,7 +5081,7 @@ void post_process_path_stuff()
 }
 
 // MjnMixael
-void post_process_props()
+void post_process_mission_props()
 {
 	for (int i = 0; i < static_cast<int>(Parse_props.size()); i++) {
 		parsed_prop* propp = &Parse_props[i];
@@ -6457,7 +6457,7 @@ bool post_process_mission(mission *pm)
 	ship_weapon	*swp;
 	ship_obj *so;
 
-	post_process_props();
+	post_process_mission_props();
 
 	// Goober5000 - this must be done even before post_process_ships_wings because it is a prerequisite
 	ship_clear_ship_type_counts();

code/model/modelrender.cpp

@@ -3148,7 +3148,7 @@ bool render_tech_model(tech_render_type model_type, int x1, int y1, int x2, int
 			}
 
 			// Make sure model is loaded
-			model_num = model_load(pip->pof_file);
+			model_num = model_load(pip->pof_file.c_str());
 
 			break;
 

code/parse/sexp.cpp

@@ -4454,7 +4454,7 @@ void preload_change_prop_class(const char* text)
 	// preload the model, just in case there is no other prop of this class in the mission
 	// (this eliminates the slight pause during a mission when changing to a previously unloaded model)
 	pip = &Prop_info[idx];
-	pip->model_num = model_load(pip->pof_file);
+	pip->model_num = model_load(pip->pof_file.c_str());
 
 	if (pip->model_num >= 0)
 		model_page_in_textures(pip->model_num, idx);