diff --git a/Platforms/Android/Program.cs b/Platforms/Android/Program.cs index 2fc0962..ceb283a 100644 --- a/Platforms/Android/Program.cs +++ b/Platforms/Android/Program.cs @@ -32,13 +32,15 @@ namespace MyUniverse.Platforms.Android ILogger logger = new RotatingFileLogger("Logs", "MyGame"); + IUniverseObject mobileParent = universe.InstantiateUniverseObject().SetUniverseObject("Desktop"); + universe.InstantiateUniverseObject().SetUniverseObject("Logger") .BehaviourController.AddBehaviour().Logger = ILogger.Shared = logger; - universe.InstantiateUniverseObject().SetUniverseObject("Desktop Inputs") + universe.InstantiateUniverseObject().SetUniverseObject("Mobile Inputs", mobileParent) .BehaviourController.AddBehaviour(); - universe.InstantiateUniverseObject().SetUniverseObject("Visual Managers") + universe.InstantiateUniverseObject().SetUniverseObject("Visual Managers", mobileParent) .BehaviourController.AddBehaviour() .BehaviourController.AddBehaviour(); diff --git a/Platforms/Desktop/Program.cs b/Platforms/Desktop/Program.cs index 7b4a81e..844eb0e 100644 --- a/Platforms/Desktop/Program.cs +++ b/Platforms/Desktop/Program.cs @@ -10,6 +10,7 @@ using Engine.Systems.Network; using MyUniverse.Platforms.Desktop; Universe universe = new(); +using MonoGameWindow monoGameWindow = new(universe); ISerializer serializer = new YamlSerializer(); @@ -22,10 +23,12 @@ logger = new LoggerWrapper(logger, new ConsoleLogger()); universe.InstantiateUniverseObject().SetUniverseObject("Logger") .BehaviourController.AddBehaviour().Logger = ILogger.Shared = logger; -universe.InstantiateUniverseObject().SetUniverseObject("Desktop Inputs") +IUniverseObject desktopParent = universe.InstantiateUniverseObject().SetUniverseObject("Desktop"); + +universe.InstantiateUniverseObject().SetUniverseObject("Desktop Inputs", desktopParent) .BehaviourController.AddBehaviour(); -universe.InstantiateUniverseObject().SetUniverseObject("Visual Managers") +universe.InstantiateUniverseObject().SetUniverseObject("Visual Managers", desktopParent) .BehaviourController.AddBehaviour() .BehaviourController.AddBehaviour(); @@ -37,8 +40,6 @@ universe.OnPreUpdate.AddOneTimeListener((_, _) => client.Connect("localhost", 88 MyUniverse.Shared.UniverseSource.ApplyUniverse(universe); -using MonoGameWindow monoGameWindow = new(universe); - monoGameWindow.Graphics.GraphicsProfile = GraphicsProfile.HiDef; monoGameWindow.Run();