Add toggles for exporting only Solid or only non Solid LevelItem geo (#253)

* Add toggles for exporting only Solid or only non Solid LevelItem geo

* Update toolstrip items to represent Visible or Collidable and to check the visible or solid flags accordingly for filtered export. Added ToolTips to both.

---------

Co-authored-by: ItsEasyActually <darkspines35@gmail.com>

Author: Shadowth117

SALVL/ImportExport.cs

@@ -89,7 +89,7 @@ private void ImportLevelItem(bool multiple = false)
 		}
 
 		// Export models from stage (Assimp)
-		private void ExportLevelObj(string fileName, bool selectedOnly)
+		private void ExportLevelObj(string fileName, bool selectedOnly, bool exportSolidOnly, bool exportVisibleOnly)
 		{
 			int stepCount = 0;
 			int numSteps = 0;
@@ -98,13 +98,33 @@ private void ExportLevelObj(string fileName, bool selectedOnly)
 				stepCount = LevelData.TextureBitmaps[LevelData.leveltexs].Length;
 				numSteps = stepCount;
 			}
-			List<COL> cols = LevelData.geo.COL;
-			List<GeoAnimData> anims = LevelData.geo.Anim;
+
+			//Sort out level data
+			List<LevelItem> items;
+			List<GeoAnimData> anims;
 			if (selectedOnly)
 			{
-				cols = selectedItems.Items.OfType<LevelItem>().Select(a => a.CollisionData).ToList();
+				items = selectedItems.Items.OfType<LevelItem>().ToList();
 				anims = selectedItems.Items.OfType<LevelAnim>().Select(a => a.GeoAnimationData).ToList();
 			}
+			else
+			{
+				items = LevelData.LevelItems.ToList();
+				anims = LevelData.geo.Anim;
+			}
+
+			//Sort out collision and regular models
+			if (exportSolidOnly)
+			{
+				items = items.Where(a => a.Solid == true).ToList();
+			}
+			else if (exportVisibleOnly)
+			{
+				items = items.Where(a => a.Visible == true).ToList();
+			}
+
+			List<COL> cols = items.Select(a => a.CollisionData).ToList();
+
 			stepCount += cols.Count;
 			stepCount += anims.Count;
 
@@ -172,7 +192,7 @@ private void ExportLevelObj(string fileName, bool selectedOnly)
 		}
 
 		// Export C structs
-		private void exportStructs(string filename, bool selectedOnly)
+		private void exportStructs(string filename, bool selectedOnly, bool exportOnlySolid, bool exportOnlyNonSolid)
 		{
 			LandTableFormat fmt = LevelData.geo.Format;
 			switch (fmt)
@@ -209,11 +229,31 @@ private void exportStructs(string filename, bool selectedOnly)
 					if (selectedItem is LevelItem)
 					{
 						LevelItem levelItem = selectedItem as LevelItem;
-						string path = Path.Combine(filename, levelItem.CollisionData.Model.Name + ".c");
-						using (StreamWriter sw = File.CreateText(path))
+
+						//Only export based on collision flag
+						bool export = true;
+						if (exportOnlySolid)
 						{
-							WriteStructMetadata(sw, false, fmt, texnames);
-							levelItem.CollisionData.Model.ToStructVariables(sw, usetBasicDXFormatToolStripMenuItem.Checked, labels, texnames);
+							if(levelItem.Solid == false)
+							{
+								export = false;
+							}
+						} else if(exportOnlyNonSolid)
+						{
+							if (levelItem.Solid == true)
+							{
+								export = false;
+							}
+						}
+
+						if (export)
+						{
+							string path = Path.Combine(filename, levelItem.CollisionData.Model.Name + ".c");
+							using (StreamWriter sw = File.CreateText(path))
+							{
+								WriteStructMetadata(sw, false, fmt, texnames);
+								levelItem.CollisionData.Model.ToStructVariables(sw, usetBasicDXFormatToolStripMenuItem.Checked, labels, texnames);
+							}
 						}
 					}
 					else if (selectedItem is LevelAnim)

SALVL/MainForm.Designer.cs

@@ -1773,7 +1773,7 @@ private void exportAssimpSelectedItemsToolStripMenuItem_Click(object sender, Eve
 			{
 				if (a.ShowDialog() == DialogResult.OK)
 				{
-					ExportLevelObj(a.FileName, true);
+					ExportLevelObj(a.FileName, true, exportCollisionGeometry.Checked, exportVisibleGeometry.Checked);
 				}
 			}
 		}
@@ -1817,7 +1817,7 @@ private void exportAssimpLevelToolStripMenuItem_Click(object sender, EventArgs e
 			{
 				if (a.ShowDialog() == DialogResult.OK)
 				{
-					ExportLevelObj(a.FileName, false);
+					ExportLevelObj(a.FileName, false, exportCollisionGeometry.Checked, exportVisibleGeometry.Checked);
 				}
 			}
 		}
@@ -1827,7 +1827,7 @@ private void exportSelectedItemsStructsToolStripMenuItem_Click(object sender, Ev
 			using (FolderBrowserDialog folderBrowser = new FolderBrowserDialog() { })
 				if (folderBrowser.ShowDialog() == DialogResult.OK)
 				{
-					exportStructs(folderBrowser.SelectedPath, true);
+					exportStructs(folderBrowser.SelectedPath, true, exportCollisionGeometry.Checked, exportVisibleGeometry.Checked);
 				}
 		}
 
@@ -1836,7 +1836,7 @@ private void exportLevelStructsToolStripMenuItem_Click(object sender, EventArgs
 			using (SaveFileDialog sd = new SaveFileDialog() { DefaultExt = "c", Filter = "C file|*.c" })
 				if (sd.ShowDialog(this) == DialogResult.OK)
 				{
-					exportStructs(sd.FileName, false);
+					exportStructs(sd.FileName, false, exportCollisionGeometry.Checked, exportVisibleGeometry.Checked);
 				}
 		}
 
@@ -2442,5 +2442,23 @@ private void addLevelAnimationToolStripMenuItem_Click(object sender, EventArgs e
 		{
 			ImportLevelAnimation();
 		}
+
+		private void exportOnlyNonCollideableToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			exportVisibleGeometry.Checked = exportVisibleGeometry.Checked;
+			if(exportVisibleGeometry.Checked == true)
+			{
+				exportCollisionGeometry.Checked = false;
+			}
+		}
+
+		private void exportOnlyCollideableToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			exportCollisionGeometry.Checked = exportCollisionGeometry.Checked;
+			if (exportCollisionGeometry.Checked == true)
+			{
+				exportVisibleGeometry.Checked = false;
+			}
+		}
 	}
 }