FUSEEProjectTeam · ASPePeX · Sep 24, 2021 · Sep 22, 2021 · Sep 22, 2021 · Sep 22, 2021
diff --git a/Examples/Complete/AdvancedUI/Android/MainActivity.cs b/Examples/Complete/AdvancedUI/Android/MainActivity.cs
@@ -64,7 +64,7 @@ protected override void OnCreate(Bundle savedInstanceState)
                         {
                             if (Path.GetExtension(id).ToLower().Contains("fus"))
                             {
-                                return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage));
+                                return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage), id);
                             }
                             return null;
                         },

diff --git a/Examples/Complete/BoneAnimation/Android/MainActivity.cs b/Examples/Complete/BoneAnimation/Android/MainActivity.cs
@@ -62,7 +62,7 @@ protected override void OnCreate(Bundle savedInstanceState)
                         {
                             if (Path.GetExtension(id).ToLower().Contains("fus"))
                             {
-                                return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage));
+                                return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage), id);
                             }
                             return null;
                         },

diff --git a/Examples/Complete/Camera/Android/MainActivity.cs b/Examples/Complete/Camera/Android/MainActivity.cs
@@ -65,7 +65,7 @@ protected override void OnCreate(Bundle savedInstanceState)
                         {
                             if (Path.GetExtension(id).Contains("fus", System.StringComparison.OrdinalIgnoreCase))
                             {
-                                return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage));
+                                return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage), id);
                             }
                             return null;
                         },

diff --git a/Examples/Complete/GeometryEditing/Android/MainActivity.cs b/Examples/Complete/GeometryEditing/Android/MainActivity.cs
@@ -62,7 +62,7 @@ protected override void OnCreate(Bundle savedInstanceState)
                         {
                             if (Path.GetExtension(id).ToLower().Contains("fus"))
                             {
-                                return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage));
+                                return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage), id);
                             }
                             return null;
                         },

diff --git a/Examples/Complete/Integrations/Wpf/View/MainWindow.xaml.cs b/Examples/Complete/Integrations/Wpf/View/MainWindow.xaml.cs
@@ -77,7 +77,7 @@ private void OpenFusee()
                         Decoder = (string id, object storage) =>
                         {
                             if (!Path.GetExtension(id).Contains("fus", System.StringComparison.OrdinalIgnoreCase)) return null;
-                            return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage));
+                            return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage), id);
                         },
                         Checker = id => Path.GetExtension(id).Contains("fus", System.StringComparison.OrdinalIgnoreCase)
                     });

diff --git a/Examples/Complete/Labyrinth/Desktop/MainDesktop.cs b/Examples/Complete/Labyrinth/Desktop/MainDesktop.cs
@@ -35,7 +35,7 @@ public static void Main()
                     Decoder = (string id, object storage) =>
                     {
                         if (!Path.GetExtension(id).Contains("fus", System.StringComparison.OrdinalIgnoreCase)) return null;
-                        return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage));
+                        return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage), id);
                     },
                     Checker = id => Path.GetExtension(id).Contains("fus", System.StringComparison.OrdinalIgnoreCase)
                 });

diff --git a/Examples/Complete/Materials/Android/MainActivity.cs b/Examples/Complete/Materials/Android/MainActivity.cs
@@ -61,7 +61,7 @@ protected override void OnCreate(Bundle savedInstanceState)
                         {
                             if (Path.GetExtension(id).ToLower().Contains("fus"))
                             {
-                                return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage));
+                                return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage), id);
                             }
                             return null;
                         },

diff --git a/Examples/Complete/MeshingAround/Android/MainActivity.cs b/Examples/Complete/MeshingAround/Android/MainActivity.cs
@@ -64,7 +64,7 @@ protected override void OnCreate(Bundle savedInstanceState)
                         {
                             if (Path.GetExtension(id).ToLower().Contains("fus"))
                             {
-                                return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage));
+                                return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage), id);
                             }
                             return null;
                         },

diff --git a/Examples/Complete/NormalMap/Android/MainActivity.cs b/Examples/Complete/NormalMap/Android/MainActivity.cs
@@ -61,7 +61,7 @@ protected override void OnCreate(Bundle savedInstanceState)
                         {
                             if (Path.GetExtension(id).ToLower().Contains("fus"))
                             {
-                                return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage));
+                                return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage), id);
                             }
                             return null;
                         },

diff --git a/Examples/Complete/Picking/Android/MainActivity.cs b/Examples/Complete/Picking/Android/MainActivity.cs
@@ -62,7 +62,7 @@ protected override void OnCreate(Bundle savedInstanceState)
                         {
                             if (Path.GetExtension(id).ToLower().Contains("fus"))
                             {
-                                return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage));
+                                return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage), id);
                             }
                             return null;
                         },

diff --git a/Examples/Complete/RenderLayer/Android/MainActivity.cs b/Examples/Complete/RenderLayer/Android/MainActivity.cs
@@ -62,7 +62,7 @@ protected override void OnCreate(Bundle savedInstanceState)
                         {
                             if (Path.GetExtension(id).ToLower().Contains("fus"))
                             {
-                                return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage));
+                                return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage), id);
                             }
                             return null;
                         },

diff --git a/Examples/Complete/RenderLayer/Desktop/Main.cs b/Examples/Complete/RenderLayer/Desktop/Main.cs
@@ -36,7 +36,7 @@ public static void Main()
                     Decoder = (string id, object storage) =>
                     {
                         if (!Path.GetExtension(id).Contains("fus", System.StringComparison.OrdinalIgnoreCase)) return null;
-                        return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage));
+                        return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage), id);
                     },
                     Checker = id => Path.GetExtension(id).Contains("fus", System.StringComparison.OrdinalIgnoreCase)
                 });

diff --git a/Examples/Complete/Simple/Android/MainActivity.cs b/Examples/Complete/Simple/Android/MainActivity.cs
@@ -62,7 +62,7 @@ protected override void OnCreate(Bundle savedInstanceState)
                         {
                             if (Path.GetExtension(id).ToLower().Contains("fus"))
                             {
-                                return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage));
+                                return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage), id);
                             }
                             return null;
                         },

diff --git a/Examples/Complete/SimpleDeferred/Android/MainActivity.cs b/Examples/Complete/SimpleDeferred/Android/MainActivity.cs
@@ -64,7 +64,7 @@ protected override void OnCreate(Bundle savedInstanceState)
                         {
                             if (Path.GetExtension(id).ToLower().Contains("fus"))
                             {
-                                return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage));
+                                return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage), id);
                             }
                             return null;
                         },

diff --git a/Examples/Complete/Starkiller/Desktop/MainDesktop.cs b/Examples/Complete/Starkiller/Desktop/MainDesktop.cs
@@ -36,7 +36,7 @@ public static void Main()
                     Decoder = (string id, object storage) =>
                     {
                         if (!Path.GetExtension(id).Contains("fus", System.StringComparison.OrdinalIgnoreCase)) return null;
-                        return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage));
+                        return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage), id);
                     },
                     Checker = id => Path.GetExtension(id).Contains("fus", System.StringComparison.OrdinalIgnoreCase)
                 });

diff --git a/Examples/Complete/SurfaceEffects/Android/MainActivity.cs b/Examples/Complete/SurfaceEffects/Android/MainActivity.cs
@@ -61,7 +61,7 @@ protected override void OnCreate(Bundle savedInstanceState)
                         {
                             if (Path.GetExtension(id).ToLower().Contains("fus"))
                             {
-                                return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage));
+                                return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage), id);
                             }
                             return null;
                         },

diff --git a/Examples/Complete/SurfaceEffects/Desktop/Main.cs b/Examples/Complete/SurfaceEffects/Desktop/Main.cs
@@ -35,7 +35,7 @@ public static void Main()
                     Decoder = (string id, object storage) =>
                     {
                         if (!Path.GetExtension(id).Contains("fus", System.StringComparison.OrdinalIgnoreCase)) return null;
-                        return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage));
+                        return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage), id);
                     },
                     Checker = id => Path.GetExtension(id).Contains("fus", System.StringComparison.OrdinalIgnoreCase)
                 });

diff --git a/Examples/Complete/ThreeDFont/Android/MainActivity.cs b/Examples/Complete/ThreeDFont/Android/MainActivity.cs
@@ -64,7 +64,7 @@ protected override void OnCreate(Bundle savedInstanceState)
                         {
                             if (Path.GetExtension(id).ToLower().Contains("fus"))
                             {
-                                return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage));
+                                return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage), id);
                             }
                             return null;
                         },

diff --git a/Examples/Complete/UI/Android/MainActivity.cs b/Examples/Complete/UI/Android/MainActivity.cs
@@ -64,7 +64,7 @@ protected override void OnCreate(Bundle savedInstanceState)
                         {
                             if (Path.GetExtension(id).ToLower().Contains("fus"))
                             {
-                                return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage));
+                                return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage), id);
                             }
                             return null;
                         },

diff --git a/dis/VSTemplate/VSTemplate/Android/Android.cs b/dis/VSTemplate/VSTemplate/Android/Android.cs
@@ -55,7 +55,7 @@ protected override void OnCreate(Bundle savedInstanceState)
                     {
                         if (!Path.GetExtension(id).Contains("fus", StringComparison.OrdinalIgnoreCase)) return null;
 
-                        return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage));
+                        return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage), id);
                     },
                     Checker = id => Path.GetExtension(id).Contains("fus", StringComparison.OrdinalIgnoreCase)
                 });

diff --git a/dis/VSTemplate/VSTemplate/Desktop/Desktop.cs b/dis/VSTemplate/VSTemplate/Desktop/Desktop.cs
@@ -36,7 +36,7 @@ public static void Main()
                 Decoder = (string id, object storage) =>
                 {
                     if (!Path.GetExtension(id).Contains("fus", System.StringComparison.OrdinalIgnoreCase)) return null;
-                    return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage));
+                    return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage), id);
                 },
                 Checker = id => Path.GetExtension(id).Contains("fus", System.StringComparison.OrdinalIgnoreCase)
             });

diff --git a/src/Engine/Core/FusSceneConverter.cs b/src/Engine/Core/FusSceneConverter.cs
@@ -23,8 +23,8 @@ public static class FusSceneConverter
         /// Traverses the given SceneContainer and creates new high level graph <see cref="Scene"/> by converting and/or splitting its components into the high level equivalents.
         /// </summary>
         /// <param name="fus">The FusFile to convert.</param>
-        /// <param name="id"></param>
-        public static SceneContainer ConvertFrom(FusFile fus, string id = null)
+        /// <param name="id">The path, filename and extension</param>
+        public static SceneContainer ConvertFrom(FusFile fus, string id)
         {
             if (fus == null)
             {

diff --git a/src/Engine/Player/Android/MainActivity.cs b/src/Engine/Player/Android/MainActivity.cs
@@ -57,7 +57,7 @@ protected override void OnCreate(Bundle savedInstanceState)
                         {
                             if (!Path.GetExtension(id).Contains("fus", StringComparison.OrdinalIgnoreCase)) return null;
 
-                            return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage));
+                            return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage), id);
                         },
                         Checker = id => Path.GetExtension(id).Contains("fus", StringComparison.OrdinalIgnoreCase)
                     });

diff --git a/src/Tests/GameWindow/Desktop/Program.cs b/src/Tests/GameWindow/Desktop/Program.cs
@@ -41,7 +41,7 @@ public static void Init()
                     Decoder = (string id, object storage) =>
                     {
                         if (!Path.GetExtension(id).Contains("fus", System.StringComparison.OrdinalIgnoreCase)) return null;
-                        return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage));
+                        return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage), id);
                     },
                     Checker = id => Path.GetExtension(id).Contains("fus", System.StringComparison.OrdinalIgnoreCase)
                 });

diff --git a/src/Tests/Render/Desktop/Program.cs b/src/Tests/Render/Desktop/Program.cs
@@ -44,7 +44,7 @@ public static void Init(string arg)
                         Decoder = (string id, object storage) =>
                         {
                             if (!Path.GetExtension(id).Contains("fus", System.StringComparison.OrdinalIgnoreCase)) return null;
-                            return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage));
+                            return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage), id);
                         },
                         Checker = id => Path.GetExtension(id).Contains("fus", System.StringComparison.OrdinalIgnoreCase)
                     });

diff --git a/src/Tests/Serialization/V1/SimpleConvertSceneGraph.cs b/src/Tests/Serialization/V1/SimpleConvertSceneGraph.cs
@@ -245,7 +245,7 @@ public void V1_SimpleScene_Convert()
             }
 
             // Now we are sure the converted FusFile resembles the ground truth SceneContainer. We can deserialize it to test those methods.
-            var FusFileConvertedToGT = FusSceneConverter.ConvertFrom(fusFileFromGroundTruth);
+            var FusFileConvertedToGT = FusSceneConverter.ConvertFrom(fusFileFromGroundTruth, "Test.fus");
             var sceneFileFlattenedAgain = new List<Xene.IComponent>();
             FlattenScene(sceneFileFlattenedAgain, (FusFileConvertedToGT.Children[0]));
 

diff --git a/src/Tools/FusViewer/MainWindowViewModel.cs b/src/Tools/FusViewer/MainWindowViewModel.cs
@@ -42,7 +42,7 @@ public void Execute(object parameter)
             {
                 _caller.PathToFile = openFileDialog.FileName;
                 using var stream = File.OpenRead(openFileDialog.FileName);
-                _caller.CurrentContainer = FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>(stream));
+                _caller.CurrentContainer = FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>(stream), openFileDialog.FileName);
             }
         }