Merge pull request #425 from bid-soft/dev

RenderManager: parse dependencies of subtype
Valheim-Modding · Mar 28, 2024 · 4a3f1f0 · 4a3f1f0
2 parents 8dd2357 + 4ecd3d4
commit 4a3f1f0
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/JotunnLib/Managers/RenderManager.cs b/JotunnLib/Managers/RenderManager.cs
@@ -467,9 +467,15 @@ private static List<Type> GetTopolocialSort(Transform tranform)
         private static bool TopologicalSortUtil(Type node, HashSet<Type> visited, HashSet<Type> recursionStack, List<Type> result)
         {
             // Type already processed
-            if (visited.Contains(node) || visited.Any(node.IsSubclassOf))
+            if (visited.Contains(node)) return true;           
+            List<Type> tailList = null;
+
+            //check if supertype is already in list, split list to insert dependencies of sub type before super type
+            int splitIndex = result.FindIndex(node.IsSubclassOf);
+            if (splitIndex != -1)
             {
-                return true;
+                tailList = result.Skip(splitIndex).ToList();
+                result.RemoveRange(splitIndex, result.Count - splitIndex);
             }
 
             // Cycle detected
@@ -487,9 +493,12 @@ private static bool TopologicalSortUtil(Type node, HashSet<Type> visited, HashSe
                 }
             }
 
+            // if super type was in list, concat tail of list back without adding subtype to result
+            if (tailList != null) result.AddRange(tailList);
+            else result.Add(node);
+
             recursionStack.Remove(node);
-            visited.Add(node);
-            result.Add(node);
+            visited.Add(node);            
 
             return true;
         }