Add option to omit vertex colors on model import #73

igorseabra4 · Oct 16, 2024 · 7d19eaf · 7d19eaf
1 parent 56ea327
commit 7d19eaf
Show file tree

Hide file tree

Showing 6 changed files with 175 additions and 63 deletions.
diff --git a/IndustrialPark/ArchiveEditor/Dialogs/ImportModel.Designer.cs b/IndustrialPark/ArchiveEditor/Dialogs/ImportModel.Designer.cs
diff --git a/IndustrialPark/ArchiveEditor/Dialogs/ImportModel.cs b/IndustrialPark/ArchiveEditor/Dialogs/ImportModel.cs
@@ -95,21 +95,23 @@ public static (List<Section_AHDR> AHDRs, bool overwrite, bool simps, bool ledgeG
                                     ReadFileMethods.ExportRenderWareFile(
                                         CreateDFFFromAssimp(filePath,
                                         a.checkBoxFlipUVs.Checked,
-                                        a.checkBoxIgnoreMeshColors.Checked),
+                                        a.checkBoxUseMeshColors.Checked,
+                                        a.radioButtonWhiteVCol.Checked
+                                        ),
                                         modelRenderWareVersion(game));
                             }
-                            catch (ArgumentException)
+                            catch (ArgumentException e)
                             {
                                 MessageBox.Show("Model could not be imported.\nPlease check that the vertex/triangle counts do not exceed "
-                                    + TRI_AND_VERTEX_LIMIT + ".",
+                                    + TRI_AND_VERTEX_LIMIT + ".\n " + e.Message,
                                     "Error Importing Model",
                                     MessageBoxButtons.OK,
                                     MessageBoxIcon.Error);
                                 return (null, false, false, false, false, false, false, false);
                             }
-                            catch (Exception)
+                            catch (Exception e)
                             {
-                                MessageBox.Show("Model could not be imported.",
+                                MessageBox.Show($"Model could not be imported.\n{e.Message}",
                                     "Error Importing Model",
                                     MessageBoxButtons.OK,
                                     MessageBoxIcon.Error);
@@ -127,7 +129,7 @@ public static (List<Section_AHDR> AHDRs, bool overwrite, bool simps, bool ledgeG
                                     ReadFileMethods.ExportRenderWareFile(
                                         CreateBSPFromAssimp(filePath,
                                         a.checkBoxFlipUVs.Checked,
-                                        a.checkBoxIgnoreMeshColors.Checked),
+                                        a.checkBoxUseMeshColors.Checked),
                                         modelRenderWareVersion(game));
                             }
                             catch (ArgumentException)