Fix the code that fetches the model from the part's config.

TheDarkBadger · Sep 28, 2021 · 32ac73e · 32ac73e
1 parent 50e4545
commit 32ac73e
Showing 1 changed file with 21 additions and 3 deletions.
diff --git a/Source-Code/VesselDraw.cs b/Source-Code/VesselDraw.cs
@@ -324,11 +324,29 @@ public void Awake()
 
                     if (cfgNode.HasValue("name"))
                     {
+                        string partName = cfgNode.GetValue("name");
                         string url = urlConfig.parent.url.Substring(0, urlConfig.parent.url.LastIndexOf("/"));
-                        string model = System.IO.Path.GetFileNameWithoutExtension(cfgNode.GetValue("mesh"));
-                        if (!partModelNameLookup.ContainsKey(urlConfig.name))
+                        if (cfgNode.HasValue("mesh"))
+                        { 
+                            string modelName = cfgNode.GetValue("mesh");
+                            modelName = System.IO.Path.GetFileNameWithoutExtension(modelName);
+                            Debug.LogFormat("DOE Addint {0} {1}/{2}", partName, url, modelName);
+                            partModelNameLookup.Add(partName, url + "/" + modelName);
+                        }
+                        else if (cfgNode.HasNode("MODEL"))
+                        {
+                            ConfigNode cn = cfgNode.GetNode("MODEL");
+                            string modelName = cn?.GetValue("model");
+                            Debug.LogFormat("DOE Addint {0} {1}", partName, modelName);
+                            partModelNameLookup.Add(partName, modelName);
+                        }
+                        else
                         {
-                            partModelNameLookup.Add(urlConfig.name, url + "/" + model);
+                            if (DistantObjectSettings.debugMode)
+                            {
+                                Debug.LogError(Constants.DistantObject + " -- Could not find a model for part " + partName + ".  Part will not render for VesselDraw.");
+                            }
+                            sawErrors = true;
                         }
                     }
                     else