Atomic C# work

Build/AtomicSharp/MyClass.cs → Build/AtomicSharp/AtomicEngine.cs

@@ -2,10 +2,12 @@
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 
-namespace Atomic
+using AtomicPlayer;
+
+namespace AtomicEngine
 {
 
-	public static class AtomicSharp
+	public static class Atomic
 	{
 		[DllImport (Constants.LIBNAME, CallingConvention = CallingConvention.Cdecl)]
 		private static extern int atomicsharp_initialize ();
@@ -13,7 +15,9 @@ namespace Atomic
 		[DllImport (Constants.LIBNAME, CallingConvention = CallingConvention.Cdecl)]
 		private static extern bool atomicsharp_runframe ();
 
-
+		[DllImport (Constants.LIBNAME, CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+		private static extern IntPtr csb_AtomicEngine_GetSubsystem(string name);
+					
 		public static bool RunFrame()
 		{
 			GC.Collect();
@@ -36,7 +40,27 @@ namespace Atomic
 			AtomicPlayer.PlayerModule.Initialize ();
 
 			atomicsharp_initialize ();
+
+			initSubsystems ();
+		}
+
+		static Dictionary<Type, RefCounted> subSystems = new Dictionary<Type, RefCounted>();
+
+		static private void registerSubsystem (RefCounted subsystem)
+		{
+			subSystems[subsystem.GetType()] = subsystem;
+		}
+
+		static public T GetSubsystem<T>() where T : RefCounted
+		{
+			return (T) subSystems [typeof(T)];
 		}
+
+		static private void initSubsystems()
+		{
+			registerSubsystem (NativeCore.WrapNative<Player> (csb_AtomicEngine_GetSubsystem("Player")));	
+		}
+
 	}
 
 	public static partial class Constants

Build/AtomicSharp/AtomicSharp.csproj

@@ -31,7 +31,6 @@
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="MyClass.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="..\Source\Generated\MACOSX\CSharp\Packages\Atomic\Managed\CSModuleContainer.cs">
       <Link>CSModuleContainer.cs</Link>
@@ -54,6 +53,7 @@
     <Compile Include="..\Source\Generated\MACOSX\CSharp\Packages\AtomicPlayer\Managed\CSModulePlayer.cs">
       <Link>CSModulePlayer.cs</Link>
     </Compile>
+    <Compile Include="AtomicEngine.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>

Build/AtomicSharp/AtomicSharpTest/Program.cs

@@ -1,28 +1,20 @@
 using System;
-
-using Atomic;
+using AtomicEngine;
 using AtomicPlayer;
 
 namespace AtomicSharpTest
 {
 	class MainClass
-	{
-		static Scene CreateScene() {
-
-			var node = new Node ();
-			var player = (Player)node.GetSubsystem ("Player");
-			player.LoadScene ("Scenes/Scene.scene", null);		
-			return player.CurrentScene;
-
-		}
-				
+	{				
 		public static void Main (string[] args)
 		{
-			Atomic.AtomicSharp.Initialize ();
+			Atomic.Initialize ();
 
-			CreateScene ();
+			var player = Atomic.GetSubsystem<Player> ();
+
+			player.LoadScene ("Scenes/Scene.scene", null);		
 
-			while (Atomic.AtomicSharp.RunFrame ()) {
+			while (Atomic.RunFrame ()) {
 						
 				
 			}

Source/AtomicSharp/AtomicSharpAPI.cpp

@@ -26,4 +26,10 @@ ClassID csb_RefCounted_GetClassID(RefCounted* refCounted)
     return refCounted->GetClassID();
 }
 
+RefCounted* csb_AtomicEngine_GetSubsystem(const char* name)
+{
+    return AtomicSharp::GetContext()->GetSubsystem(name);
+}
+
+
 }

Source/ToolCore/JSBind/CSharp/CSModuleWriter.cpp

@@ -347,9 +347,12 @@ void CSModuleWriter::GenerateManagedSource()
 
     source += "\nusing System;\nusing System.Collections.Generic;\nusing System.Runtime.InteropServices;\n";
 
-    if (moduleName != "Atomic")
+    if (moduleName == "Atomic")
+        moduleName = "AtomicEngine";
+
+    if (moduleName != "AtomicEngine")
     {
-        source += "using Atomic;\n";
+        source += "using AtomicEngine;\n";
     }
 
     source += "\n\n";