Working on embedded CoreCLR

Build/AtomicNET/AtomicNETBootstrap/Bootstrap.cs

@@ -0,0 +1,48 @@
+
+using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Runtime.Loader;
+
+// This must be in TPA list
+public class AtomicLoadContext : AssemblyLoadContext
+{
+
+    public static void Startup()
+    {
+      AssemblyLoadContext.InitializeDefaultContext(new AtomicLoadContext());
+      Console.WriteLine("Bootstrap Startup");
+    }
+
+
+    [DllImport("dl")]
+    protected static extern IntPtr dlopen(string filename, int flags);
+
+    protected override IntPtr LoadUnmanagedDll(String unmanagedDllName)
+    {
+      if (unmanagedDllName == "__Internal")
+      {
+        return dlopen(null, 1 /*RTLD_LAZY*/);
+      }
+
+      // do we need to walk paths here?
+      return dlopen(unmanagedDllName, 1 /*RTLD_LAZY*/);
+    }
+
+    protected override Assembly Load(AssemblyName assemblyName)
+    {
+
+      Console.WriteLine(assemblyName.Name);
+      Assembly assembly = null;
+      try {
+        assembly = LoadFromAssemblyPath("/Users/josh/Desktop/" + assemblyName.Name + ".dll");
+      } catch (Exception e)
+      {
+        Console.WriteLine(e.Message);
+      }
+      Console.WriteLine("Assembly: " + assembly);
+      return assembly;
+
+    }
+
+}

Build/AtomicNET/AtomicNETRuntime/AtomicNET.cs

@@ -0,0 +1,214 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Collections.Generic;
+
+namespace AtomicEngine
+{
+
+public class AtomicNETRuntime
+{
+  [DllImport (Constants.LIBNAME, CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+  public static extern int csb_Atomic_Test (int id);
+
+  public static void Startup()
+  {
+    //Console.WriteLine("AtomicNETRuntime Startup:" + csb_Atomic_Test(42));
+
+    Atomic.Initialize();
+
+  }
+}
+
+public static class Atomic
+{
+
+  static public void Initialize()
+  {
+    ContainerModule.Initialize ();
+    CoreModule.Initialize ();
+    MathModule.Initialize ();
+    EngineModule.Initialize ();
+    InputModule.Initialize ();
+    IOModule.Initialize ();
+    ResourceModule.Initialize ();
+    AudioModule.Initialize ();
+    GraphicsModule.Initialize ();
+    SceneModule.Initialize ();
+    Atomic2DModule.Initialize ();
+    Atomic3DModule.Initialize ();
+    NavigationModule.Initialize ();
+    NetworkModule.Initialize ();
+    PhysicsModule.Initialize ();
+    EnvironmentModule.Initialize ();
+    UIModule.Initialize ();
+    AtomicPlayer.PlayerModule.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<Graphics> (csb_AtomicEngine_GetSubsystem("Graphics")));
+    registerSubsystem (NativeCore.WrapNative<Renderer> (csb_AtomicEngine_GetSubsystem("Renderer")));
+    registerSubsystem (NativeCore.WrapNative<ResourceCache> (csb_AtomicEngine_GetSubsystem("ResourceCache")));
+
+    var zone = GetSubsystem<Renderer>().GetDefaultZone();
+    Console.WriteLine("Allocated: " + zone.nativeInstance);
+  }
+
+  [DllImport (Constants.LIBNAME, CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+  private static extern IntPtr csb_AtomicEngine_GetSubsystem(string name);
+
+}
+
+public static partial class Constants
+{
+    public const string LIBNAME = "__Internal";
+}
+
+public partial class RefCounted
+{
+
+  public RefCounted()
+  {
+  }
+
+  protected RefCounted (IntPtr native)
+  {
+    nativeInstance = native;
+  }
+
+  public IntPtr nativeInstance;
+
+  [DllImport (Constants.LIBNAME, CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+  public static extern IntPtr csb_Atomic_RefCounted_GetClassID (IntPtr self);
+
+}
+
+static class NativeCore
+{
+  [DllImport (Constants.LIBNAME, CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+  private static extern void csb_AtomicEngine_ReleaseRef (IntPtr refCounted);
+
+  // given an existing instance classID, construct the managed instance, with downcast support (ask for Component, get StaticModel for example)
+  public static Dictionary<IntPtr, Func<IntPtr, RefCounted>> nativeClassIDToManagedConstructor = new Dictionary<IntPtr, Func<IntPtr, RefCounted>>();
+
+  // weak references here, hold a ref native side
+  public static Dictionary<IntPtr, WeakReference> nativeLookup = new Dictionary<IntPtr, WeakReference> ();
+
+  // native engine types, instances of these types can be trivially recreated managed side
+  private static Dictionary<Type, Type> nativeTypes = new Dictionary<Type, Type> ();
+
+  public static bool GetNativeType (Type type)
+  {
+    return nativeTypes.ContainsKey (type);
+  }
+
+  public static void RegisterNativeType (Type type)
+  {
+    nativeTypes.Add (type, type);
+  }
+
+  public static void ReleaseExpiredNativeReferences()
+  {
+    List<IntPtr> released = new List<IntPtr> ();
+
+    foreach(KeyValuePair<IntPtr, WeakReference> entry in nativeLookup)
+    {
+
+      if (entry.Value.Target == null || !entry.Value.IsAlive)
+      {
+        released.Add (entry.Key);
+      }
+
+    }
+
+    foreach (IntPtr native in released) {
+      nativeLookup.Remove (native);
+      csb_AtomicEngine_ReleaseRef(native);
+    }
+
+  }
+
+  // called by native code
+  public static void NETUpdate (float timeStep)
+  {
+    GC.Collect();
+    GC.WaitForPendingFinalizers();
+    GC.Collect();
+    ReleaseExpiredNativeReferences();
+  }
+
+  // called by native code for every refcounted deleted
+  public static void RefCountedDeleted (IntPtr native)
+  {
+    nativeLookup.Remove(native);
+  }
+
+  // register a newly created native
+  public static IntPtr RegisterNative (IntPtr native, RefCounted r)
+  {
+    r.nativeInstance = native;
+
+    var w = new WeakReference (r);
+    NativeCore.nativeLookup [native] = w;
+    // keep native side alive
+    r.AddRef();
+
+    return native;
+  }
+
+  // wraps an existing native instance, with downcast support
+  public static T WrapNative<T> (IntPtr native) where T:RefCounted
+  {
+    if (native == IntPtr.Zero)
+      return null;
+
+    WeakReference w;
+
+    // first see if we're already available
+    if (nativeLookup.TryGetValue (native, out w)) {
+
+      if (w.IsAlive) {
+
+        // we're alive!
+        return (T)w.Target;
+
+      } else {
+
+        // we were seen before, but have since been GC'd, remove!
+        nativeLookup.Remove (native);
+        csb_AtomicEngine_ReleaseRef(native);
+      }
+    }
+
+    IntPtr classID = RefCounted.csb_Atomic_RefCounted_GetClassID (native);
+
+    // and store, with downcast support for instance Component -> StaticModel
+    // we never want to hit this path for script inherited natives
+
+    RefCounted r = nativeClassIDToManagedConstructor[classID](native);
+    w = new WeakReference (r);
+    NativeCore.nativeLookup [native] = w;
+
+    // store a ref, so native side will not be released while we still have a reference in managed code
+    r.AddRef();
+
+    return (T) r;
+
+  }
+
+}
+
+}

Build/AtomicNET/AtomicNETRuntime/Math.cs

@@ -0,0 +1,138 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace AtomicEngine
+{
+	[StructLayout (LayoutKind.Sequential, CharSet = CharSet.Ansi)]
+	public struct Vector3
+	{
+		public Vector3 (float x, float y, float z)
+		{
+			this.x = x;
+			this.y = y;
+			this.z = z;
+		}
+
+		public override string ToString()
+		{
+			return x + ", " + y + ", " + z;
+		}
+
+		public float x;
+		public float y;
+		public float z;
+
+
+		/// Zero vector.
+		static public readonly Vector3 Zero = new Vector3(0, 0, 0);
+		/// (-1,0,0) vector.
+		static public readonly Vector3 Left = new Vector3(-1, 0, 0);
+		/// (1,0,0) vector.
+		static public readonly Vector3 Right = new Vector3(1, 0, 0);
+		/// (0,1,0) vector.
+		static public readonly Vector3 Up = new Vector3(0, 1, 0);
+		/// (0,-1,0) vector.
+		static public readonly Vector3 Down = new Vector3(0, -1, 0);
+		/// (0,0,1) vector.
+		static public readonly Vector3 Forward = new Vector3(0, 0, 1);
+		/// (0,0,-1) vector.
+		static public readonly Vector3 Back = new Vector3(0, 0, -1);
+		/// (1,1,1) vector.
+		static public readonly Vector3 One = new Vector3(1, 1, 1);
+
+	}
+
+	[StructLayout (LayoutKind.Sequential, CharSet = CharSet.Ansi)]
+	public struct Vector4
+	{
+	}
+
+	[StructLayout (LayoutKind.Sequential, CharSet = CharSet.Ansi)]
+	public struct Vector2
+	{
+		public Vector2 (float x, float y)
+		{
+			this.x = x;
+			this.y = y;
+		}
+			
+		public float x;
+		public float y;
+
+	}
+
+	[StructLayout (LayoutKind.Sequential, CharSet = CharSet.Ansi)]
+	public struct Quaternion
+	{
+		public Quaternion (float w = 1.0f, float x = 0.0f, float y = 0.0f, float z = 0.0f)
+		{
+			this.w = w;
+			this.x = x;
+			this.y = y;
+			this.z = z;
+		}
+
+		public override string ToString()
+		{
+			return x + ", " + y + ", " + z;
+		}
+
+		public float w;
+		public float x;
+		public float y;
+		public float z;
+			
+		static public readonly Quaternion Identity = new Quaternion();
+
+	}
+
+	[StructLayout (LayoutKind.Sequential, CharSet = CharSet.Ansi)]
+	public struct Color
+	{
+		public Color (float r, float g, float b, float a = 1.0f)
+		{
+			this.r = r;
+			this.g = g;
+			this.b = b;
+			this.a = a;
+		}
+
+		public float r;
+		public float g;
+		public float b;
+		public float a;
+
+	}
+
+	[StructLayout (LayoutKind.Sequential, CharSet = CharSet.Ansi)]
+	public struct IntRect
+	{
+	}
+
+	[StructLayout (LayoutKind.Sequential, CharSet = CharSet.Ansi)]
+	public struct IntVector2
+	{
+		public int x;
+		public int y;
+
+		public IntVector2 (int x, int y)
+		{
+			this.x = x;
+			this.y = y;
+		}
+
+
+		static public readonly IntVector2 Zero = new IntVector2(0, 0);
+
+	}
+
+	[StructLayout (LayoutKind.Sequential, CharSet = CharSet.Ansi)]
+	public struct BoundingBox
+	{
+	}
+
+	[StructLayout (LayoutKind.Sequential, CharSet = CharSet.Ansi)]
+	public struct Rect
+	{
+	}}
+

Build/AtomicNET/AtomicNETRuntime/SDLConsts.cs

@@ -0,0 +1,635 @@
+#region License
+/* SDL2# - C# Wrapper for SDL2
+ *
+ * Copyright (c) 2013-2015 Ethan Lee.
+ *
+ * This software is provided 'as-is', without any express or implied warranty.
+ * In no event will the authors be held liable for any damages arising from
+ * the use of this software.
+ *
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ *
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software in a
+ * product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ *
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ *
+ * 3. This notice may not be removed or altered from any source distribution.
+ *
+ * Ethan "flibitijibibo" Lee <[email protected]>
+ *
+ */
+#endregion
+
+namespace AtomicEngine
+{
+
+	public static class SDL
+	{
+
+
+		public const int SDL_BUTTON_LEFT =	1;
+		public const int SDL_BUTTON_MIDDLE =	2;
+		public const int SDL_BUTTON_RIGHT =	3;
+		public const int SDL_BUTTON_X1 =	4;
+		public const int SDL_BUTTON_X2 =	5;
+		public const int SDL_BUTTON_LMASK =	(1 << ((int)SDL_BUTTON_LEFT - 1));
+		public const int SDL_BUTTON_MMASK =	(1 << ((int)SDL_BUTTON_MIDDLE - 1));
+		public const int SDL_BUTTON_RMASK =	(1 << ((int)SDL_BUTTON_RIGHT - 1));
+		public const int SDL_BUTTON_X1MASK = (1 << ((int)SDL_BUTTON_X1 - 1));
+		public const int SDL_BUTTON_X2MASK = (1 << ((int)SDL_BUTTON_X2 - 1));
+
+		public const byte SDL_HAT_CENTERED =	0x00;
+		public const byte SDL_HAT_UP =		0x01;
+		public const byte SDL_HAT_RIGHT =	0x02;
+		public const byte SDL_HAT_DOWN =	0x04;
+		public const byte SDL_HAT_LEFT =	0x08;
+		public const byte SDL_HAT_RIGHTUP =	SDL_HAT_RIGHT | SDL_HAT_UP;
+		public const byte SDL_HAT_RIGHTDOWN =	SDL_HAT_RIGHT | SDL_HAT_DOWN;
+		public const byte SDL_HAT_LEFTUP =	SDL_HAT_LEFT | SDL_HAT_UP;
+		public const byte SDL_HAT_LEFTDOWN =	SDL_HAT_LEFT | SDL_HAT_DOWN;
+
+		public enum SDL_GameControllerButton
+		{
+			SDL_CONTROLLER_BUTTON_INVALID = -1,
+			SDL_CONTROLLER_BUTTON_A,
+			SDL_CONTROLLER_BUTTON_B,
+			SDL_CONTROLLER_BUTTON_X,
+			SDL_CONTROLLER_BUTTON_Y,
+			SDL_CONTROLLER_BUTTON_BACK,
+			SDL_CONTROLLER_BUTTON_GUIDE,
+			SDL_CONTROLLER_BUTTON_START,
+			SDL_CONTROLLER_BUTTON_LEFTSTICK,
+			SDL_CONTROLLER_BUTTON_RIGHTSTICK,
+			SDL_CONTROLLER_BUTTON_LEFTSHOULDER,
+			SDL_CONTROLLER_BUTTON_RIGHTSHOULDER,
+			SDL_CONTROLLER_BUTTON_DPAD_UP,
+			SDL_CONTROLLER_BUTTON_DPAD_DOWN,
+			SDL_CONTROLLER_BUTTON_DPAD_LEFT,
+			SDL_CONTROLLER_BUTTON_DPAD_RIGHT,
+			SDL_CONTROLLER_BUTTON_MAX,
+		}
+
+		public enum SDL_GameControllerAxis
+		{
+			SDL_CONTROLLER_AXIS_INVALID = -1,
+			SDL_CONTROLLER_AXIS_LEFTX,
+			SDL_CONTROLLER_AXIS_LEFTY,
+			SDL_CONTROLLER_AXIS_RIGHTX,
+			SDL_CONTROLLER_AXIS_RIGHTY,
+			SDL_CONTROLLER_AXIS_TRIGGERLEFT,
+			SDL_CONTROLLER_AXIS_TRIGGERRIGHT,
+			SDL_CONTROLLER_AXIS_MAX
+		}
+
+
+		/* Scancodes based off USB keyboard page (0x07) */
+		public enum SDL_Scancode
+		{
+			SDL_SCANCODE_UNKNOWN = 0,
+
+			SDL_SCANCODE_A = 4,
+			SDL_SCANCODE_B = 5,
+			SDL_SCANCODE_C = 6,
+			SDL_SCANCODE_D = 7,
+			SDL_SCANCODE_E = 8,
+			SDL_SCANCODE_F = 9,
+			SDL_SCANCODE_G = 10,
+			SDL_SCANCODE_H = 11,
+			SDL_SCANCODE_I = 12,
+			SDL_SCANCODE_J = 13,
+			SDL_SCANCODE_K = 14,
+			SDL_SCANCODE_L = 15,
+			SDL_SCANCODE_M = 16,
+			SDL_SCANCODE_N = 17,
+			SDL_SCANCODE_O = 18,
+			SDL_SCANCODE_P = 19,
+			SDL_SCANCODE_Q = 20,
+			SDL_SCANCODE_R = 21,
+			SDL_SCANCODE_S = 22,
+			SDL_SCANCODE_T = 23,
+			SDL_SCANCODE_U = 24,
+			SDL_SCANCODE_V = 25,
+			SDL_SCANCODE_W = 26,
+			SDL_SCANCODE_X = 27,
+			SDL_SCANCODE_Y = 28,
+			SDL_SCANCODE_Z = 29,
+
+			SDL_SCANCODE_1 = 30,
+			SDL_SCANCODE_2 = 31,
+			SDL_SCANCODE_3 = 32,
+			SDL_SCANCODE_4 = 33,
+			SDL_SCANCODE_5 = 34,
+			SDL_SCANCODE_6 = 35,
+			SDL_SCANCODE_7 = 36,
+			SDL_SCANCODE_8 = 37,
+			SDL_SCANCODE_9 = 38,
+			SDL_SCANCODE_0 = 39,
+
+			SDL_SCANCODE_RETURN = 40,
+			SDL_SCANCODE_ESCAPE = 41,
+			SDL_SCANCODE_BACKSPACE = 42,
+			SDL_SCANCODE_TAB = 43,
+			SDL_SCANCODE_SPACE = 44,
+
+			SDL_SCANCODE_MINUS = 45,
+			SDL_SCANCODE_EQUALS = 46,
+			SDL_SCANCODE_LEFTBRACKET = 47,
+			SDL_SCANCODE_RIGHTBRACKET = 48,
+			SDL_SCANCODE_BACKSLASH = 49,
+			SDL_SCANCODE_NONUSHASH = 50,
+			SDL_SCANCODE_SEMICOLON = 51,
+			SDL_SCANCODE_APOSTROPHE = 52,
+			SDL_SCANCODE_GRAVE = 53,
+			SDL_SCANCODE_COMMA = 54,
+			SDL_SCANCODE_PERIOD = 55,
+			SDL_SCANCODE_SLASH = 56,
+
+			SDL_SCANCODE_CAPSLOCK = 57,
+
+			SDL_SCANCODE_F1 = 58,
+			SDL_SCANCODE_F2 = 59,
+			SDL_SCANCODE_F3 = 60,
+			SDL_SCANCODE_F4 = 61,
+			SDL_SCANCODE_F5 = 62,
+			SDL_SCANCODE_F6 = 63,
+			SDL_SCANCODE_F7 = 64,
+			SDL_SCANCODE_F8 = 65,
+			SDL_SCANCODE_F9 = 66,
+			SDL_SCANCODE_F10 = 67,
+			SDL_SCANCODE_F11 = 68,
+			SDL_SCANCODE_F12 = 69,
+
+			SDL_SCANCODE_PRINTSCREEN = 70,
+			SDL_SCANCODE_SCROLLLOCK = 71,
+			SDL_SCANCODE_PAUSE = 72,
+			SDL_SCANCODE_INSERT = 73,
+			SDL_SCANCODE_HOME = 74,
+			SDL_SCANCODE_PAGEUP = 75,
+			SDL_SCANCODE_DELETE = 76,
+			SDL_SCANCODE_END = 77,
+			SDL_SCANCODE_PAGEDOWN = 78,
+			SDL_SCANCODE_RIGHT = 79,
+			SDL_SCANCODE_LEFT = 80,
+			SDL_SCANCODE_DOWN = 81,
+			SDL_SCANCODE_UP = 82,
+
+			SDL_SCANCODE_NUMLOCKCLEAR = 83,
+			SDL_SCANCODE_KP_DIVIDE = 84,
+			SDL_SCANCODE_KP_MULTIPLY = 85,
+			SDL_SCANCODE_KP_MINUS = 86,
+			SDL_SCANCODE_KP_PLUS = 87,
+			SDL_SCANCODE_KP_ENTER = 88,
+			SDL_SCANCODE_KP_1 = 89,
+			SDL_SCANCODE_KP_2 = 90,
+			SDL_SCANCODE_KP_3 = 91,
+			SDL_SCANCODE_KP_4 = 92,
+			SDL_SCANCODE_KP_5 = 93,
+			SDL_SCANCODE_KP_6 = 94,
+			SDL_SCANCODE_KP_7 = 95,
+			SDL_SCANCODE_KP_8 = 96,
+			SDL_SCANCODE_KP_9 = 97,
+			SDL_SCANCODE_KP_0 = 98,
+			SDL_SCANCODE_KP_PERIOD = 99,
+
+			SDL_SCANCODE_NONUSBACKSLASH = 100,
+			SDL_SCANCODE_APPLICATION = 101,
+			SDL_SCANCODE_POWER = 102,
+			SDL_SCANCODE_KP_EQUALS = 103,
+			SDL_SCANCODE_F13 = 104,
+			SDL_SCANCODE_F14 = 105,
+			SDL_SCANCODE_F15 = 106,
+			SDL_SCANCODE_F16 = 107,
+			SDL_SCANCODE_F17 = 108,
+			SDL_SCANCODE_F18 = 109,
+			SDL_SCANCODE_F19 = 110,
+			SDL_SCANCODE_F20 = 111,
+			SDL_SCANCODE_F21 = 112,
+			SDL_SCANCODE_F22 = 113,
+			SDL_SCANCODE_F23 = 114,
+			SDL_SCANCODE_F24 = 115,
+			SDL_SCANCODE_EXECUTE = 116,
+			SDL_SCANCODE_HELP = 117,
+			SDL_SCANCODE_MENU = 118,
+			SDL_SCANCODE_SELECT = 119,
+			SDL_SCANCODE_STOP = 120,
+			SDL_SCANCODE_AGAIN = 121,
+			SDL_SCANCODE_UNDO = 122,
+			SDL_SCANCODE_CUT = 123,
+			SDL_SCANCODE_COPY = 124,
+			SDL_SCANCODE_PASTE = 125,
+			SDL_SCANCODE_FIND = 126,
+			SDL_SCANCODE_MUTE = 127,
+			SDL_SCANCODE_VOLUMEUP = 128,
+			SDL_SCANCODE_VOLUMEDOWN = 129,
+			/* not sure whether there's a reason to enable these */
+			/*	SDL_SCANCODE_LOCKINGCAPSLOCK = 130,  */
+			/*	SDL_SCANCODE_LOCKINGNUMLOCK = 131, */
+			/*	SDL_SCANCODE_LOCKINGSCROLLLOCK = 132, */
+			SDL_SCANCODE_KP_COMMA = 133,
+			SDL_SCANCODE_KP_EQUALSAS400 = 134,
+
+			SDL_SCANCODE_INTERNATIONAL1 = 135,
+			SDL_SCANCODE_INTERNATIONAL2 = 136,
+			SDL_SCANCODE_INTERNATIONAL3 = 137,
+			SDL_SCANCODE_INTERNATIONAL4 = 138,
+			SDL_SCANCODE_INTERNATIONAL5 = 139,
+			SDL_SCANCODE_INTERNATIONAL6 = 140,
+			SDL_SCANCODE_INTERNATIONAL7 = 141,
+			SDL_SCANCODE_INTERNATIONAL8 = 142,
+			SDL_SCANCODE_INTERNATIONAL9 = 143,
+			SDL_SCANCODE_LANG1 = 144,
+			SDL_SCANCODE_LANG2 = 145,
+			SDL_SCANCODE_LANG3 = 146,
+			SDL_SCANCODE_LANG4 = 147,
+			SDL_SCANCODE_LANG5 = 148,
+			SDL_SCANCODE_LANG6 = 149,
+			SDL_SCANCODE_LANG7 = 150,
+			SDL_SCANCODE_LANG8 = 151,
+			SDL_SCANCODE_LANG9 = 152,
+
+			SDL_SCANCODE_ALTERASE = 153,
+			SDL_SCANCODE_SYSREQ = 154,
+			SDL_SCANCODE_CANCEL = 155,
+			SDL_SCANCODE_CLEAR = 156,
+			SDL_SCANCODE_PRIOR = 157,
+			SDL_SCANCODE_RETURN2 = 158,
+			SDL_SCANCODE_SEPARATOR = 159,
+			SDL_SCANCODE_OUT = 160,
+			SDL_SCANCODE_OPER = 161,
+			SDL_SCANCODE_CLEARAGAIN = 162,
+			SDL_SCANCODE_CRSEL = 163,
+			SDL_SCANCODE_EXSEL = 164,
+
+			SDL_SCANCODE_KP_00 = 176,
+			SDL_SCANCODE_KP_000 = 177,
+			SDL_SCANCODE_THOUSANDSSEPARATOR = 178,
+			SDL_SCANCODE_DECIMALSEPARATOR = 179,
+			SDL_SCANCODE_CURRENCYUNIT = 180,
+			SDL_SCANCODE_CURRENCYSUBUNIT = 181,
+			SDL_SCANCODE_KP_LEFTPAREN = 182,
+			SDL_SCANCODE_KP_RIGHTPAREN = 183,
+			SDL_SCANCODE_KP_LEFTBRACE = 184,
+			SDL_SCANCODE_KP_RIGHTBRACE = 185,
+			SDL_SCANCODE_KP_TAB = 186,
+			SDL_SCANCODE_KP_BACKSPACE = 187,
+			SDL_SCANCODE_KP_A = 188,
+			SDL_SCANCODE_KP_B = 189,
+			SDL_SCANCODE_KP_C = 190,
+			SDL_SCANCODE_KP_D = 191,
+			SDL_SCANCODE_KP_E = 192,
+			SDL_SCANCODE_KP_F = 193,
+			SDL_SCANCODE_KP_XOR = 194,
+			SDL_SCANCODE_KP_POWER = 195,
+			SDL_SCANCODE_KP_PERCENT = 196,
+			SDL_SCANCODE_KP_LESS = 197,
+			SDL_SCANCODE_KP_GREATER = 198,
+			SDL_SCANCODE_KP_AMPERSAND = 199,
+			SDL_SCANCODE_KP_DBLAMPERSAND = 200,
+			SDL_SCANCODE_KP_VERTICALBAR = 201,
+			SDL_SCANCODE_KP_DBLVERTICALBAR = 202,
+			SDL_SCANCODE_KP_COLON = 203,
+			SDL_SCANCODE_KP_HASH = 204,
+			SDL_SCANCODE_KP_SPACE = 205,
+			SDL_SCANCODE_KP_AT = 206,
+			SDL_SCANCODE_KP_EXCLAM = 207,
+			SDL_SCANCODE_KP_MEMSTORE = 208,
+			SDL_SCANCODE_KP_MEMRECALL = 209,
+			SDL_SCANCODE_KP_MEMCLEAR = 210,
+			SDL_SCANCODE_KP_MEMADD = 211,
+			SDL_SCANCODE_KP_MEMSUBTRACT = 212,
+			SDL_SCANCODE_KP_MEMMULTIPLY = 213,
+			SDL_SCANCODE_KP_MEMDIVIDE = 214,
+			SDL_SCANCODE_KP_PLUSMINUS = 215,
+			SDL_SCANCODE_KP_CLEAR = 216,
+			SDL_SCANCODE_KP_CLEARENTRY = 217,
+			SDL_SCANCODE_KP_BINARY = 218,
+			SDL_SCANCODE_KP_OCTAL = 219,
+			SDL_SCANCODE_KP_DECIMAL = 220,
+			SDL_SCANCODE_KP_HEXADECIMAL = 221,
+
+			SDL_SCANCODE_LCTRL = 224,
+			SDL_SCANCODE_LSHIFT = 225,
+			SDL_SCANCODE_LALT = 226,
+			SDL_SCANCODE_LGUI = 227,
+			SDL_SCANCODE_RCTRL = 228,
+			SDL_SCANCODE_RSHIFT = 229,
+			SDL_SCANCODE_RALT = 230,
+			SDL_SCANCODE_RGUI = 231,
+
+			SDL_SCANCODE_MODE = 257,
+
+			/* These come from the USB consumer page (0x0C) */
+			SDL_SCANCODE_AUDIONEXT = 258,
+			SDL_SCANCODE_AUDIOPREV = 259,
+			SDL_SCANCODE_AUDIOSTOP = 260,
+			SDL_SCANCODE_AUDIOPLAY = 261,
+			SDL_SCANCODE_AUDIOMUTE = 262,
+			SDL_SCANCODE_MEDIASELECT = 263,
+			SDL_SCANCODE_WWW = 264,
+			SDL_SCANCODE_MAIL = 265,
+			SDL_SCANCODE_CALCULATOR = 266,
+			SDL_SCANCODE_COMPUTER = 267,
+			SDL_SCANCODE_AC_SEARCH = 268,
+			SDL_SCANCODE_AC_HOME = 269,
+			SDL_SCANCODE_AC_BACK = 270,
+			SDL_SCANCODE_AC_FORWARD = 271,
+			SDL_SCANCODE_AC_STOP = 272,
+			SDL_SCANCODE_AC_REFRESH = 273,
+			SDL_SCANCODE_AC_BOOKMARKS = 274,
+
+			/* These come from other sources, and are mostly mac related */
+			SDL_SCANCODE_BRIGHTNESSDOWN = 275,
+			SDL_SCANCODE_BRIGHTNESSUP = 276,
+			SDL_SCANCODE_DISPLAYSWITCH = 277,
+			SDL_SCANCODE_KBDILLUMTOGGLE = 278,
+			SDL_SCANCODE_KBDILLUMDOWN = 279,
+			SDL_SCANCODE_KBDILLUMUP = 280,
+			SDL_SCANCODE_EJECT = 281,
+			SDL_SCANCODE_SLEEP = 282,
+
+			SDL_SCANCODE_APP1 = 283,
+			SDL_SCANCODE_APP2 = 284,
+
+			/* This is not a key, simply marks the number of scancodes
+			 * so that you know how big to make your arrays. */
+			SDL_NUM_SCANCODES = 512
+		}
+
+		public const int SDLK_SCANCODE_MASK = (1 << 30);
+
+		public enum SDL_Keycode
+		{
+			SDLK_UNKNOWN = 0,
+
+			SDLK_RETURN = '\r',
+			SDLK_ESCAPE = 27,
+			// '\033'
+			SDLK_BACKSPACE = '\b',
+			SDLK_TAB = '\t',
+			SDLK_SPACE = ' ',
+			SDLK_EXCLAIM = '!',
+			SDLK_QUOTEDBL = '"',
+			SDLK_HASH = '#',
+			SDLK_PERCENT = '%',
+			SDLK_DOLLAR = '$',
+			SDLK_AMPERSAND = '&',
+			SDLK_QUOTE = '\'',
+			SDLK_LEFTPAREN = '(',
+			SDLK_RIGHTPAREN = ')',
+			SDLK_ASTERISK = '*',
+			SDLK_PLUS = '+',
+			SDLK_COMMA = ',',
+			SDLK_MINUS = '-',
+			SDLK_PERIOD = '.',
+			SDLK_SLASH = '/',
+			SDLK_0 = '0',
+			SDLK_1 = '1',
+			SDLK_2 = '2',
+			SDLK_3 = '3',
+			SDLK_4 = '4',
+			SDLK_5 = '5',
+			SDLK_6 = '6',
+			SDLK_7 = '7',
+			SDLK_8 = '8',
+			SDLK_9 = '9',
+			SDLK_COLON = ':',
+			SDLK_SEMICOLON = ';',
+			SDLK_LESS = '<',
+			SDLK_EQUALS = '=',
+			SDLK_GREATER = '>',
+			SDLK_QUESTION = '?',
+			SDLK_AT = '@',
+			/*
+			Skip uppercase letters
+			*/
+			SDLK_LEFTBRACKET = '[',
+			SDLK_BACKSLASH = '\\',
+			SDLK_RIGHTBRACKET = ']',
+			SDLK_CARET = '^',
+			SDLK_UNDERSCORE = '_',
+			SDLK_BACKQUOTE = '`',
+			SDLK_a = 'a',
+			SDLK_b = 'b',
+			SDLK_c = 'c',
+			SDLK_d = 'd',
+			SDLK_e = 'e',
+			SDLK_f = 'f',
+			SDLK_g = 'g',
+			SDLK_h = 'h',
+			SDLK_i = 'i',
+			SDLK_j = 'j',
+			SDLK_k = 'k',
+			SDLK_l = 'l',
+			SDLK_m = 'm',
+			SDLK_n = 'n',
+			SDLK_o = 'o',
+			SDLK_p = 'p',
+			SDLK_q = 'q',
+			SDLK_r = 'r',
+			SDLK_s = 's',
+			SDLK_t = 't',
+			SDLK_u = 'u',
+			SDLK_v = 'v',
+			SDLK_w = 'w',
+			SDLK_x = 'x',
+			SDLK_y = 'y',
+			SDLK_z = 'z',
+
+			SDLK_CAPSLOCK = (int)SDL_Scancode.SDL_SCANCODE_CAPSLOCK | SDLK_SCANCODE_MASK,
+
+			SDLK_F1 = (int)SDL_Scancode.SDL_SCANCODE_F1 | SDLK_SCANCODE_MASK,
+			SDLK_F2 = (int)SDL_Scancode.SDL_SCANCODE_F2 | SDLK_SCANCODE_MASK,
+			SDLK_F3 = (int)SDL_Scancode.SDL_SCANCODE_F3 | SDLK_SCANCODE_MASK,
+			SDLK_F4 = (int)SDL_Scancode.SDL_SCANCODE_F4 | SDLK_SCANCODE_MASK,
+			SDLK_F5 = (int)SDL_Scancode.SDL_SCANCODE_F5 | SDLK_SCANCODE_MASK,
+			SDLK_F6 = (int)SDL_Scancode.SDL_SCANCODE_F6 | SDLK_SCANCODE_MASK,
+			SDLK_F7 = (int)SDL_Scancode.SDL_SCANCODE_F7 | SDLK_SCANCODE_MASK,
+			SDLK_F8 = (int)SDL_Scancode.SDL_SCANCODE_F8 | SDLK_SCANCODE_MASK,
+			SDLK_F9 = (int)SDL_Scancode.SDL_SCANCODE_F9 | SDLK_SCANCODE_MASK,
+			SDLK_F10 = (int)SDL_Scancode.SDL_SCANCODE_F10 | SDLK_SCANCODE_MASK,
+			SDLK_F11 = (int)SDL_Scancode.SDL_SCANCODE_F11 | SDLK_SCANCODE_MASK,
+			SDLK_F12 = (int)SDL_Scancode.SDL_SCANCODE_F12 | SDLK_SCANCODE_MASK,
+
+			SDLK_PRINTSCREEN = (int)SDL_Scancode.SDL_SCANCODE_PRINTSCREEN | SDLK_SCANCODE_MASK,
+			SDLK_SCROLLLOCK = (int)SDL_Scancode.SDL_SCANCODE_SCROLLLOCK | SDLK_SCANCODE_MASK,
+			SDLK_PAUSE = (int)SDL_Scancode.SDL_SCANCODE_PAUSE | SDLK_SCANCODE_MASK,
+			SDLK_INSERT = (int)SDL_Scancode.SDL_SCANCODE_INSERT | SDLK_SCANCODE_MASK,
+			SDLK_HOME = (int)SDL_Scancode.SDL_SCANCODE_HOME | SDLK_SCANCODE_MASK,
+			SDLK_PAGEUP = (int)SDL_Scancode.SDL_SCANCODE_PAGEUP | SDLK_SCANCODE_MASK,
+			SDLK_DELETE = 127,
+			SDLK_END = (int)SDL_Scancode.SDL_SCANCODE_END | SDLK_SCANCODE_MASK,
+			SDLK_PAGEDOWN = (int)SDL_Scancode.SDL_SCANCODE_PAGEDOWN | SDLK_SCANCODE_MASK,
+			SDLK_RIGHT = (int)SDL_Scancode.SDL_SCANCODE_RIGHT | SDLK_SCANCODE_MASK,
+			SDLK_LEFT = (int)SDL_Scancode.SDL_SCANCODE_LEFT | SDLK_SCANCODE_MASK,
+			SDLK_DOWN = (int)SDL_Scancode.SDL_SCANCODE_DOWN | SDLK_SCANCODE_MASK,
+			SDLK_UP = (int)SDL_Scancode.SDL_SCANCODE_UP | SDLK_SCANCODE_MASK,
+
+			SDLK_NUMLOCKCLEAR = (int)SDL_Scancode.SDL_SCANCODE_NUMLOCKCLEAR | SDLK_SCANCODE_MASK,
+			SDLK_KP_DIVIDE = (int)SDL_Scancode.SDL_SCANCODE_KP_DIVIDE | SDLK_SCANCODE_MASK,
+			SDLK_KP_MULTIPLY = (int)SDL_Scancode.SDL_SCANCODE_KP_MULTIPLY | SDLK_SCANCODE_MASK,
+			SDLK_KP_MINUS = (int)SDL_Scancode.SDL_SCANCODE_KP_MINUS | SDLK_SCANCODE_MASK,
+			SDLK_KP_PLUS = (int)SDL_Scancode.SDL_SCANCODE_KP_PLUS | SDLK_SCANCODE_MASK,
+			SDLK_KP_ENTER = (int)SDL_Scancode.SDL_SCANCODE_KP_ENTER | SDLK_SCANCODE_MASK,
+			SDLK_KP_1 = (int)SDL_Scancode.SDL_SCANCODE_KP_1 | SDLK_SCANCODE_MASK,
+			SDLK_KP_2 = (int)SDL_Scancode.SDL_SCANCODE_KP_2 | SDLK_SCANCODE_MASK,
+			SDLK_KP_3 = (int)SDL_Scancode.SDL_SCANCODE_KP_3 | SDLK_SCANCODE_MASK,
+			SDLK_KP_4 = (int)SDL_Scancode.SDL_SCANCODE_KP_4 | SDLK_SCANCODE_MASK,
+			SDLK_KP_5 = (int)SDL_Scancode.SDL_SCANCODE_KP_5 | SDLK_SCANCODE_MASK,
+			SDLK_KP_6 = (int)SDL_Scancode.SDL_SCANCODE_KP_6 | SDLK_SCANCODE_MASK,
+			SDLK_KP_7 = (int)SDL_Scancode.SDL_SCANCODE_KP_7 | SDLK_SCANCODE_MASK,
+			SDLK_KP_8 = (int)SDL_Scancode.SDL_SCANCODE_KP_8 | SDLK_SCANCODE_MASK,
+			SDLK_KP_9 = (int)SDL_Scancode.SDL_SCANCODE_KP_9 | SDLK_SCANCODE_MASK,
+			SDLK_KP_0 = (int)SDL_Scancode.SDL_SCANCODE_KP_0 | SDLK_SCANCODE_MASK,
+			SDLK_KP_PERIOD = (int)SDL_Scancode.SDL_SCANCODE_KP_PERIOD | SDLK_SCANCODE_MASK,
+
+			SDLK_APPLICATION = (int)SDL_Scancode.SDL_SCANCODE_APPLICATION | SDLK_SCANCODE_MASK,
+			SDLK_POWER = (int)SDL_Scancode.SDL_SCANCODE_POWER | SDLK_SCANCODE_MASK,
+			SDLK_KP_EQUALS = (int)SDL_Scancode.SDL_SCANCODE_KP_EQUALS | SDLK_SCANCODE_MASK,
+			SDLK_F13 = (int)SDL_Scancode.SDL_SCANCODE_F13 | SDLK_SCANCODE_MASK,
+			SDLK_F14 = (int)SDL_Scancode.SDL_SCANCODE_F14 | SDLK_SCANCODE_MASK,
+			SDLK_F15 = (int)SDL_Scancode.SDL_SCANCODE_F15 | SDLK_SCANCODE_MASK,
+			SDLK_F16 = (int)SDL_Scancode.SDL_SCANCODE_F16 | SDLK_SCANCODE_MASK,
+			SDLK_F17 = (int)SDL_Scancode.SDL_SCANCODE_F17 | SDLK_SCANCODE_MASK,
+			SDLK_F18 = (int)SDL_Scancode.SDL_SCANCODE_F18 | SDLK_SCANCODE_MASK,
+			SDLK_F19 = (int)SDL_Scancode.SDL_SCANCODE_F19 | SDLK_SCANCODE_MASK,
+			SDLK_F20 = (int)SDL_Scancode.SDL_SCANCODE_F20 | SDLK_SCANCODE_MASK,
+			SDLK_F21 = (int)SDL_Scancode.SDL_SCANCODE_F21 | SDLK_SCANCODE_MASK,
+			SDLK_F22 = (int)SDL_Scancode.SDL_SCANCODE_F22 | SDLK_SCANCODE_MASK,
+			SDLK_F23 = (int)SDL_Scancode.SDL_SCANCODE_F23 | SDLK_SCANCODE_MASK,
+			SDLK_F24 = (int)SDL_Scancode.SDL_SCANCODE_F24 | SDLK_SCANCODE_MASK,
+			SDLK_EXECUTE = (int)SDL_Scancode.SDL_SCANCODE_EXECUTE | SDLK_SCANCODE_MASK,
+			SDLK_HELP = (int)SDL_Scancode.SDL_SCANCODE_HELP | SDLK_SCANCODE_MASK,
+			SDLK_MENU = (int)SDL_Scancode.SDL_SCANCODE_MENU | SDLK_SCANCODE_MASK,
+			SDLK_SELECT = (int)SDL_Scancode.SDL_SCANCODE_SELECT | SDLK_SCANCODE_MASK,
+			SDLK_STOP = (int)SDL_Scancode.SDL_SCANCODE_STOP | SDLK_SCANCODE_MASK,
+			SDLK_AGAIN = (int)SDL_Scancode.SDL_SCANCODE_AGAIN | SDLK_SCANCODE_MASK,
+			SDLK_UNDO = (int)SDL_Scancode.SDL_SCANCODE_UNDO | SDLK_SCANCODE_MASK,
+			SDLK_CUT = (int)SDL_Scancode.SDL_SCANCODE_CUT | SDLK_SCANCODE_MASK,
+			SDLK_COPY = (int)SDL_Scancode.SDL_SCANCODE_COPY | SDLK_SCANCODE_MASK,
+			SDLK_PASTE = (int)SDL_Scancode.SDL_SCANCODE_PASTE | SDLK_SCANCODE_MASK,
+			SDLK_FIND = (int)SDL_Scancode.SDL_SCANCODE_FIND | SDLK_SCANCODE_MASK,
+			SDLK_MUTE = (int)SDL_Scancode.SDL_SCANCODE_MUTE | SDLK_SCANCODE_MASK,
+			SDLK_VOLUMEUP = (int)SDL_Scancode.SDL_SCANCODE_VOLUMEUP | SDLK_SCANCODE_MASK,
+			SDLK_VOLUMEDOWN = (int)SDL_Scancode.SDL_SCANCODE_VOLUMEDOWN | SDLK_SCANCODE_MASK,
+			SDLK_KP_COMMA = (int)SDL_Scancode.SDL_SCANCODE_KP_COMMA | SDLK_SCANCODE_MASK,
+			SDLK_KP_EQUALSAS400 =
+			(int)SDL_Scancode.SDL_SCANCODE_KP_EQUALSAS400 | SDLK_SCANCODE_MASK,
+
+			SDLK_ALTERASE = (int)SDL_Scancode.SDL_SCANCODE_ALTERASE | SDLK_SCANCODE_MASK,
+			SDLK_SYSREQ = (int)SDL_Scancode.SDL_SCANCODE_SYSREQ | SDLK_SCANCODE_MASK,
+			SDLK_CANCEL = (int)SDL_Scancode.SDL_SCANCODE_CANCEL | SDLK_SCANCODE_MASK,
+			SDLK_CLEAR = (int)SDL_Scancode.SDL_SCANCODE_CLEAR | SDLK_SCANCODE_MASK,
+			SDLK_PRIOR = (int)SDL_Scancode.SDL_SCANCODE_PRIOR | SDLK_SCANCODE_MASK,
+			SDLK_RETURN2 = (int)SDL_Scancode.SDL_SCANCODE_RETURN2 | SDLK_SCANCODE_MASK,
+			SDLK_SEPARATOR = (int)SDL_Scancode.SDL_SCANCODE_SEPARATOR | SDLK_SCANCODE_MASK,
+			SDLK_OUT = (int)SDL_Scancode.SDL_SCANCODE_OUT | SDLK_SCANCODE_MASK,
+			SDLK_OPER = (int)SDL_Scancode.SDL_SCANCODE_OPER | SDLK_SCANCODE_MASK,
+			SDLK_CLEARAGAIN = (int)SDL_Scancode.SDL_SCANCODE_CLEARAGAIN | SDLK_SCANCODE_MASK,
+			SDLK_CRSEL = (int)SDL_Scancode.SDL_SCANCODE_CRSEL | SDLK_SCANCODE_MASK,
+			SDLK_EXSEL = (int)SDL_Scancode.SDL_SCANCODE_EXSEL | SDLK_SCANCODE_MASK,
+
+			SDLK_KP_00 = (int)SDL_Scancode.SDL_SCANCODE_KP_00 | SDLK_SCANCODE_MASK,
+			SDLK_KP_000 = (int)SDL_Scancode.SDL_SCANCODE_KP_000 | SDLK_SCANCODE_MASK,
+			SDLK_THOUSANDSSEPARATOR =
+			(int)SDL_Scancode.SDL_SCANCODE_THOUSANDSSEPARATOR | SDLK_SCANCODE_MASK,
+			SDLK_DECIMALSEPARATOR =
+			(int)SDL_Scancode.SDL_SCANCODE_DECIMALSEPARATOR | SDLK_SCANCODE_MASK,
+			SDLK_CURRENCYUNIT = (int)SDL_Scancode.SDL_SCANCODE_CURRENCYUNIT | SDLK_SCANCODE_MASK,
+			SDLK_CURRENCYSUBUNIT =
+			(int)SDL_Scancode.SDL_SCANCODE_CURRENCYSUBUNIT | SDLK_SCANCODE_MASK,
+			SDLK_KP_LEFTPAREN = (int)SDL_Scancode.SDL_SCANCODE_KP_LEFTPAREN | SDLK_SCANCODE_MASK,
+			SDLK_KP_RIGHTPAREN = (int)SDL_Scancode.SDL_SCANCODE_KP_RIGHTPAREN | SDLK_SCANCODE_MASK,
+			SDLK_KP_LEFTBRACE = (int)SDL_Scancode.SDL_SCANCODE_KP_LEFTBRACE | SDLK_SCANCODE_MASK,
+			SDLK_KP_RIGHTBRACE = (int)SDL_Scancode.SDL_SCANCODE_KP_RIGHTBRACE | SDLK_SCANCODE_MASK,
+			SDLK_KP_TAB = (int)SDL_Scancode.SDL_SCANCODE_KP_TAB | SDLK_SCANCODE_MASK,
+			SDLK_KP_BACKSPACE = (int)SDL_Scancode.SDL_SCANCODE_KP_BACKSPACE | SDLK_SCANCODE_MASK,
+			SDLK_KP_A = (int)SDL_Scancode.SDL_SCANCODE_KP_A | SDLK_SCANCODE_MASK,
+			SDLK_KP_B = (int)SDL_Scancode.SDL_SCANCODE_KP_B | SDLK_SCANCODE_MASK,
+			SDLK_KP_C = (int)SDL_Scancode.SDL_SCANCODE_KP_C | SDLK_SCANCODE_MASK,
+			SDLK_KP_D = (int)SDL_Scancode.SDL_SCANCODE_KP_D | SDLK_SCANCODE_MASK,
+			SDLK_KP_E = (int)SDL_Scancode.SDL_SCANCODE_KP_E | SDLK_SCANCODE_MASK,
+			SDLK_KP_F = (int)SDL_Scancode.SDL_SCANCODE_KP_F | SDLK_SCANCODE_MASK,
+			SDLK_KP_XOR = (int)SDL_Scancode.SDL_SCANCODE_KP_XOR | SDLK_SCANCODE_MASK,
+			SDLK_KP_POWER = (int)SDL_Scancode.SDL_SCANCODE_KP_POWER | SDLK_SCANCODE_MASK,
+			SDLK_KP_PERCENT = (int)SDL_Scancode.SDL_SCANCODE_KP_PERCENT | SDLK_SCANCODE_MASK,
+			SDLK_KP_LESS = (int)SDL_Scancode.SDL_SCANCODE_KP_LESS | SDLK_SCANCODE_MASK,
+			SDLK_KP_GREATER = (int)SDL_Scancode.SDL_SCANCODE_KP_GREATER | SDLK_SCANCODE_MASK,
+			SDLK_KP_AMPERSAND = (int)SDL_Scancode.SDL_SCANCODE_KP_AMPERSAND | SDLK_SCANCODE_MASK,
+			SDLK_KP_DBLAMPERSAND =
+			(int)SDL_Scancode.SDL_SCANCODE_KP_DBLAMPERSAND | SDLK_SCANCODE_MASK,
+			SDLK_KP_VERTICALBAR =
+			(int)SDL_Scancode.SDL_SCANCODE_KP_VERTICALBAR | SDLK_SCANCODE_MASK,
+			SDLK_KP_DBLVERTICALBAR =
+			(int)SDL_Scancode.SDL_SCANCODE_KP_DBLVERTICALBAR | SDLK_SCANCODE_MASK,
+			SDLK_KP_COLON = (int)SDL_Scancode.SDL_SCANCODE_KP_COLON | SDLK_SCANCODE_MASK,
+			SDLK_KP_HASH = (int)SDL_Scancode.SDL_SCANCODE_KP_HASH | SDLK_SCANCODE_MASK,
+			SDLK_KP_SPACE = (int)SDL_Scancode.SDL_SCANCODE_KP_SPACE | SDLK_SCANCODE_MASK,
+			SDLK_KP_AT = (int)SDL_Scancode.SDL_SCANCODE_KP_AT | SDLK_SCANCODE_MASK,
+			SDLK_KP_EXCLAM = (int)SDL_Scancode.SDL_SCANCODE_KP_EXCLAM | SDLK_SCANCODE_MASK,
+			SDLK_KP_MEMSTORE = (int)SDL_Scancode.SDL_SCANCODE_KP_MEMSTORE | SDLK_SCANCODE_MASK,
+			SDLK_KP_MEMRECALL = (int)SDL_Scancode.SDL_SCANCODE_KP_MEMRECALL | SDLK_SCANCODE_MASK,
+			SDLK_KP_MEMCLEAR = (int)SDL_Scancode.SDL_SCANCODE_KP_MEMCLEAR | SDLK_SCANCODE_MASK,
+			SDLK_KP_MEMADD = (int)SDL_Scancode.SDL_SCANCODE_KP_MEMADD | SDLK_SCANCODE_MASK,
+			SDLK_KP_MEMSUBTRACT =
+			(int)SDL_Scancode.SDL_SCANCODE_KP_MEMSUBTRACT | SDLK_SCANCODE_MASK,
+			SDLK_KP_MEMMULTIPLY =
+			(int)SDL_Scancode.SDL_SCANCODE_KP_MEMMULTIPLY | SDLK_SCANCODE_MASK,
+			SDLK_KP_MEMDIVIDE = (int)SDL_Scancode.SDL_SCANCODE_KP_MEMDIVIDE | SDLK_SCANCODE_MASK,
+			SDLK_KP_PLUSMINUS = (int)SDL_Scancode.SDL_SCANCODE_KP_PLUSMINUS | SDLK_SCANCODE_MASK,
+			SDLK_KP_CLEAR = (int)SDL_Scancode.SDL_SCANCODE_KP_CLEAR | SDLK_SCANCODE_MASK,
+			SDLK_KP_CLEARENTRY = (int)SDL_Scancode.SDL_SCANCODE_KP_CLEARENTRY | SDLK_SCANCODE_MASK,
+			SDLK_KP_BINARY = (int)SDL_Scancode.SDL_SCANCODE_KP_BINARY | SDLK_SCANCODE_MASK,
+			SDLK_KP_OCTAL = (int)SDL_Scancode.SDL_SCANCODE_KP_OCTAL | SDLK_SCANCODE_MASK,
+			SDLK_KP_DECIMAL = (int)SDL_Scancode.SDL_SCANCODE_KP_DECIMAL | SDLK_SCANCODE_MASK,
+			SDLK_KP_HEXADECIMAL =
+			(int)SDL_Scancode.SDL_SCANCODE_KP_HEXADECIMAL | SDLK_SCANCODE_MASK,
+
+			SDLK_LCTRL = (int)SDL_Scancode.SDL_SCANCODE_LCTRL | SDLK_SCANCODE_MASK,
+			SDLK_LSHIFT = (int)SDL_Scancode.SDL_SCANCODE_LSHIFT | SDLK_SCANCODE_MASK,
+			SDLK_LALT = (int)SDL_Scancode.SDL_SCANCODE_LALT | SDLK_SCANCODE_MASK,
+			SDLK_LGUI = (int)SDL_Scancode.SDL_SCANCODE_LGUI | SDLK_SCANCODE_MASK,
+			SDLK_RCTRL = (int)SDL_Scancode.SDL_SCANCODE_RCTRL | SDLK_SCANCODE_MASK,
+			SDLK_RSHIFT = (int)SDL_Scancode.SDL_SCANCODE_RSHIFT | SDLK_SCANCODE_MASK,
+			SDLK_RALT = (int)SDL_Scancode.SDL_SCANCODE_RALT | SDLK_SCANCODE_MASK,
+			SDLK_RGUI = (int)SDL_Scancode.SDL_SCANCODE_RGUI | SDLK_SCANCODE_MASK,
+
+			SDLK_MODE = (int)SDL_Scancode.SDL_SCANCODE_MODE | SDLK_SCANCODE_MASK,
+
+			SDLK_AUDIONEXT = (int)SDL_Scancode.SDL_SCANCODE_AUDIONEXT | SDLK_SCANCODE_MASK,
+			SDLK_AUDIOPREV = (int)SDL_Scancode.SDL_SCANCODE_AUDIOPREV | SDLK_SCANCODE_MASK,
+			SDLK_AUDIOSTOP = (int)SDL_Scancode.SDL_SCANCODE_AUDIOSTOP | SDLK_SCANCODE_MASK,
+			SDLK_AUDIOPLAY = (int)SDL_Scancode.SDL_SCANCODE_AUDIOPLAY | SDLK_SCANCODE_MASK,
+			SDLK_AUDIOMUTE = (int)SDL_Scancode.SDL_SCANCODE_AUDIOMUTE | SDLK_SCANCODE_MASK,
+			SDLK_MEDIASELECT = (int)SDL_Scancode.SDL_SCANCODE_MEDIASELECT | SDLK_SCANCODE_MASK,
+			SDLK_WWW = (int)SDL_Scancode.SDL_SCANCODE_WWW | SDLK_SCANCODE_MASK,
+			SDLK_MAIL = (int)SDL_Scancode.SDL_SCANCODE_MAIL | SDLK_SCANCODE_MASK,
+			SDLK_CALCULATOR = (int)SDL_Scancode.SDL_SCANCODE_CALCULATOR | SDLK_SCANCODE_MASK,
+			SDLK_COMPUTER = (int)SDL_Scancode.SDL_SCANCODE_COMPUTER | SDLK_SCANCODE_MASK,
+			SDLK_AC_SEARCH = (int)SDL_Scancode.SDL_SCANCODE_AC_SEARCH | SDLK_SCANCODE_MASK,
+			SDLK_AC_HOME = (int)SDL_Scancode.SDL_SCANCODE_AC_HOME | SDLK_SCANCODE_MASK,
+			SDLK_AC_BACK = (int)SDL_Scancode.SDL_SCANCODE_AC_BACK | SDLK_SCANCODE_MASK,
+			SDLK_AC_FORWARD = (int)SDL_Scancode.SDL_SCANCODE_AC_FORWARD | SDLK_SCANCODE_MASK,
+			SDLK_AC_STOP = (int)SDL_Scancode.SDL_SCANCODE_AC_STOP | SDLK_SCANCODE_MASK,
+			SDLK_AC_REFRESH = (int)SDL_Scancode.SDL_SCANCODE_AC_REFRESH | SDLK_SCANCODE_MASK,
+			SDLK_AC_BOOKMARKS = (int)SDL_Scancode.SDL_SCANCODE_AC_BOOKMARKS | SDLK_SCANCODE_MASK,
+
+			SDLK_BRIGHTNESSDOWN =
+			(int)SDL_Scancode.SDL_SCANCODE_BRIGHTNESSDOWN | SDLK_SCANCODE_MASK,
+			SDLK_BRIGHTNESSUP = (int)SDL_Scancode.SDL_SCANCODE_BRIGHTNESSUP | SDLK_SCANCODE_MASK,
+			SDLK_DISPLAYSWITCH = (int)SDL_Scancode.SDL_SCANCODE_DISPLAYSWITCH | SDLK_SCANCODE_MASK,
+			SDLK_KBDILLUMTOGGLE =
+			(int)SDL_Scancode.SDL_SCANCODE_KBDILLUMTOGGLE | SDLK_SCANCODE_MASK,
+			SDLK_KBDILLUMDOWN = (int)SDL_Scancode.SDL_SCANCODE_KBDILLUMDOWN | SDLK_SCANCODE_MASK,
+			SDLK_KBDILLUMUP = (int)SDL_Scancode.SDL_SCANCODE_KBDILLUMUP | SDLK_SCANCODE_MASK,
+			SDLK_EJECT = (int)SDL_Scancode.SDL_SCANCODE_EJECT | SDLK_SCANCODE_MASK,
+			SDLK_SLEEP = (int)SDL_Scancode.SDL_SCANCODE_SLEEP | SDLK_SCANCODE_MASK
+		}
+	}
+
+}

Build/AtomicNET/build.sh

@@ -0,0 +1,8 @@
+
+mcs /out:/Users/josh/Desktop/OSX.x64.Debug/AtomicNETBootstrap.dll /nostdlib /noconfig /t:library /lib:/Users/josh/Desktop/OSX.x64.Debug /r:System.Console.dll /r:System.Runtime.dll /r:System.IO.dll /r:System.IO.FileSystem.dll /r:mscorlib.dll \
+/Users/josh/Dev/atomic/AtomicGameEngineSharp/Build/AtomicNET/AtomicNETBootstrap/*.cs
+
+mcs /out:/Users/josh/Desktop/AtomicNETRuntime.dll /nostdlib /noconfig /t:library /w:0 /lib:/Users/josh/Desktop/OSX.x64.Debug /r:System.Console.dll /r:System.Runtime.dll /r:System.IO.dll /r:System.IO.FileSystem.dll /r:mscorlib.dll \
+/Users/josh/Dev/atomic/AtomicGameEngineSharp/Build/Source/Generated/MACOSX/CSharp/Packages/Atomic/Managed/*.cs \
+/Users/josh/Dev/atomic/AtomicGameEngineSharp/Build/Source/Generated/MACOSX/CSharp/Packages/AtomicPlayer/Managed/*.cs \
+/Users/josh/Dev/atomic/AtomicGameEngineSharp/Build/AtomicNET/AtomicNETRuntime/*.cs

Build/AtomicSharp/CSComponent.cs

@@ -5,16 +5,16 @@ using System.Runtime.InteropServices;
 namespace AtomicEngine
 {
 	public delegate void AtomicEventDelegate (VariantMap eventData);
-	
-	public class CSComponent : Component
+
+	public partial class CSComponent : Component
 	{
 		public uint ManagedID;
 
-		public CSComponent ()
-		{	
-			nativeInstance = NativeCore.RegisterNative (csb_Atomic_CSComponent_Constructor(), this);	
-			ComponentCore.RegisterCSComponent (this);
-		}
+		//public CSComponent ()
+		//{
+		//	nativeInstance = NativeCore.RegisterNative (csb_Atomic_CSComponent_Constructor(), this);
+//			ComponentCore.RegisterCSComponent (this);
+	//	}
 
 		virtual public void Start()
 		{
@@ -23,9 +23,9 @@ namespace AtomicEngine
 
 		virtual public void Update(float timeStep)
 		{
-			
+
 		}
-			
+
 		public void SendEvent(string eventType, Dictionary<string, object> eventData = null)
 		{
 			EventCore.SendEvent (this, eventType);
@@ -40,10 +40,9 @@ namespace AtomicEngine
 		{
 			EventCore.SubscribeToEvent (this, null, eventType, function);
 		}
-						
-		[DllImport (Constants.LIBNAME, CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
-		private static extern IntPtr csb_Atomic_CSComponent_Constructor();
+
+		//[DllImport (Constants.LIBNAME, CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+		//private static extern IntPtr csb_Atomic_CSComponent_Constructor();
 
 	}
 }
-

Build/AtomicSharp/ComponentCore.cs

@@ -5,16 +5,6 @@ using System.Reflection;
 
 namespace AtomicEngine
 {
-	internal enum CSComponentMethod
-	{
-		Start,
-		DelayedStart,
-		Update,
-		PostUpdate,
-		FixedUpdate,
-		PostFixedUpdate
-	};
-
 	static internal class ComponentCore
 	{
 		static Dictionary<String, Type> componentTypes = new Dictionary<String, Type>();
@@ -32,17 +22,17 @@ namespace AtomicEngine
 
 				switch (method) {
 
-				case CSComponentMethod.Start:
-					component.Start ();
-					break;
+				//case CSComponentMethod.Start:
+				//	component.Start ();
+				//	break;
 
-				case CSComponentMethod.Update:
-					component.Update (value);
-					break;
+				//case CSComponentMethod.Update:
+				//	component.Update (value);
+				//	break;
 				}
-					
+
 			}
-			
+
 		}
 
 		public static void RegisterCSComponent(CSComponent component)
@@ -60,9 +50,9 @@ namespace AtomicEngine
 				liveComponents.Remove (c.RefID);
 			}
 		}
-			
+
 		// native create CSComponent
-		public static IntPtr CreateCSComponent(string name) 
+		public static IntPtr CreateCSComponent(string name)
 		{
 			Type type;
 
@@ -82,7 +72,7 @@ namespace AtomicEngine
 		static void RegisterComponentType(Type componentType)
 		{
 			// TODO: Check for name clash, we don't want to use assembly qualified names, etc to keep it simple
-			componentTypes [componentType.Name] = componentType;			
+			componentTypes [componentType.Name] = componentType;
 		}
 
 		public static void RegisterAssemblyComponents(Assembly assembly)
@@ -92,15 +82,15 @@ namespace AtomicEngine
 
 			List<Type> componentTypes = new List<Type> ();
 
-			foreach (Type type in types)				
+			foreach (Type type in types)
 			{
 				for (var current = type.BaseType; current != null; current = current.BaseType) {
 
 					if (current == csComponentType) {
 						componentTypes.Add(type);
-						break;						
+						break;
 					}
-				}				
+				}
 			}
 
 			foreach (Type type in componentTypes) {
@@ -113,4 +103,3 @@ namespace AtomicEngine
 
 	}
 }
-

Source/Atomic/Container/RefCounted.cpp

@@ -29,18 +29,12 @@
 namespace Atomic
 {
 
-// ATOMIC BEGIN
-unsigned RefCounted::refIDCounter_ = 1;
-HashMap<unsigned, RefCounted*> RefCounted::refLookup_;
-// ATOMIC END
+RefCountedDeletedFunction RefCounted::refCountedDeletedFunction_ = 0;
 
 RefCounted::RefCounted() :
     refCount_(new RefCount()),
     jsHeapPtr_(0)
 {
-    refID_ = refIDCounter_++;
-    refLookup_[refID_] = this;
-
     // Hold a weak ref to self to avoid possible double delete of the refcount
     (refCount_->weakRefs_)++;
 }
@@ -51,6 +45,9 @@ RefCounted::~RefCounted()
     assert(refCount_->refs_ == 0);
     assert(refCount_->weakRefs_ > 0);
 
+    if (refCountedDeletedFunction_)
+        refCountedDeletedFunction_(this);
+
     // Mark object as expired, release the self weak ref and delete the refcount if no other weak refs exist
     refCount_->refs_ = -1;
     (refCount_->weakRefs_)--;
@@ -72,7 +69,6 @@ void RefCounted::ReleaseRef()
     (refCount_->refs_)--;
     if (!refCount_->refs_)
     {
-        refLookup_.Erase(refID_);
         delete this;
     }
 }

Source/Atomic/Container/RefCounted.h

@@ -29,6 +29,8 @@ namespace Atomic
 
 // ATOMIC BEGIN
 
+class RefCounted;
+typedef void (*RefCountedDeletedFunction)(RefCounted*);
 typedef const void* ClassID;
 
 /// Macro to be included in RefCounted derived classes for efficient RTTI
@@ -90,13 +92,12 @@ public:
     virtual ClassID GetClassID() const  = 0;
     static ClassID GetClassIDStatic() { static const int typeID = 0; return (ClassID) &typeID; }
 
-    inline unsigned GetRefID() const { return refID_; }
-    inline static RefCounted* GetByID(unsigned id) { if (!refLookup_.Contains(id)) return 0; return refLookup_[id]; }
-
     /// JavaScript VM, heap object which can be pushed directly on stack without any lookups
     inline void* JSGetHeapPtr() const { return jsHeapPtr_; }
     inline void  JSSetHeapPtr(void* heapptr) { jsHeapPtr_ = heapptr; }
 
+    static void SetRefCountedDeletedFunction(RefCountedDeletedFunction function) { refCountedDeletedFunction_ = function; }
+
     // ATOMIC END
 
 private:
@@ -109,13 +110,8 @@ private:
     RefCount* refCount_;
 
     // ATOMIC BEGIN
-
-    unsigned refID_;
-    static unsigned refIDCounter_;
-    static HashMap<unsigned, RefCounted*> refLookup_;
-
     void* jsHeapPtr_;
-
+    static RefCountedDeletedFunction refCountedDeletedFunction_;
     // ATOMIC END
 
 

Source/AtomicNET/NETCore/NETCore.cpp

@@ -1,6 +1,7 @@
 
 #include <ThirdParty/SDL/include/SDL.h>
 
+#include <Atomic/Core/CoreEvents.h>
 #include <Atomic/IO/FileSystem.h>
 #include <Atomic/IO/Log.h>
 #include <Atomic/Core/StringUtils.h>
@@ -9,13 +10,14 @@
 #include "CSComponent.h"
 #include "NETCore.h"
 #include "NETManaged.h"
-#include "NETCoreThunk.h"
 
 namespace Atomic
 {
 
 /*
 mcs /nostdlib /noconfig /r:System.Console.dll /r:System.Runtime.dll /r:System.IO.dll /r:System.IO.FileSystem.dll /r:mscorlib.dll HelloWorld.cs
+
+export PAL_DBG_CHANNELS="+all.all"
 */
 
 
@@ -76,8 +78,6 @@ NETCore::NETCore(Context* context) :
 {
     RegisterNETCoreLibrary(context_);
 
-    NetCoreThunkInit();
-
     assert(!instance_);
     instance_ = this;
     csContext_ = context;
@@ -89,6 +89,8 @@ NETCore::NETCore(Context* context) :
     context_->RegisterSubsystem(dispatcher);
     context_->AddGlobalEventListener(dispatcher);
 
+    SubscribeToEvent(E_UPDATE, HANDLER(NETCore, HandleUpdate));
+
 }
 
 NETCore::~NETCore()
@@ -118,6 +120,8 @@ void NETCore::GenerateTPAList(String& tpaList)
         trustedAssemblies.Push(coreCLRFilesAbsPath_ + assembly);
     }
 
+    trustedAssemblies.Push(coreCLRFilesAbsPath_ + "HelloWorld.exe");
+
     tpaList.Join(trustedAssemblies, ":");
 
     // LOGINFOF("NetCore:: TPALIST - %s", tpaList.CString());
@@ -126,6 +130,8 @@ void NETCore::GenerateTPAList(String& tpaList)
 
 void NETCore::Shutdown()
 {
+    RefCounted::SetRefCountedDeletedFunction(0);
+
     if (sShutdownCoreCLR && hostHandle_)
     {
         sShutdownCoreCLR(hostHandle_, domainId_);
@@ -203,14 +209,36 @@ extern "C"
 // pinvoke is faster than [UnmanagedFunctionPointer] :/
 // [SuppressUnmanagedCodeSecurity] <--- add this attribute, in any event
 
-void csb_Atomic_Test(unsigned id)
+int csb_Atomic_Test(unsigned id)
 {
-  LOGINFOF("%u", id);
+  printf("Flibberty Gibbets %u", id);
+  return id;
 }
 
+ClassID csb_Atomic_RefCounted_GetClassID(RefCounted* refCounted)
+{
+    if (!refCounted)
+        return 0;
+
+    return refCounted->GetClassID();
+}
+
+RefCounted* csb_AtomicEngine_GetSubsystem(const char* name)
+{
+    return NETCore::GetContext()->GetSubsystem(name);
+}
+
+void csb_AtomicEngine_ReleaseRef(RefCounted* ref)
+{
+    if (!ref)
+        return;
+
+    ref->ReleaseRef();
 }
 
 
+}
+
 bool NETCore::Initialize(const String &coreCLRFilesAbsPath, String& errorMsg)
 {
     coreCLRFilesAbsPath_ = AddTrailingSlash(coreCLRFilesAbsPath);
@@ -249,10 +277,11 @@ bool NETCore::Initialize(const String &coreCLRFilesAbsPath, String& errorMsg)
     String tpaList;
     GenerateTPAList(tpaList);
 
-    String appPath = "/Users/josh/Desktop/OSX.x64.Debug/";
+    String appPath = "/Users/josh/Desktop/";
     Vector<String> nativeSearch;
     nativeSearch.Push(coreCLRFilesAbsPath_);
     nativeSearch.Push("/Users/josh/Dev/atomic/AtomicGameEngineSharp-build/Source/AtomicNET/NETNative");
+    nativeSearch.Push("/Users/josh/Dev/atomic/AtomicGameEngineSharp-build/Source/AtomicEditor/AtomicEditor.app/Contents/MacOS");
 
     String nativeDllSearchDirs;
     nativeDllSearchDirs.Join(nativeSearch, ":");
@@ -271,7 +300,7 @@ bool NETCore::Initialize(const String &coreCLRFilesAbsPath, String& errorMsg)
     };
 
     int st = sInitializeCoreCLR(
-                "",
+                "AtomicEditor",
                 "NETCore",
                 sizeof(propertyKeys) / sizeof(propertyKeys[0]),
                 propertyKeys,
@@ -286,26 +315,75 @@ bool NETCore::Initialize(const String &coreCLRFilesAbsPath, String& errorMsg)
         return false;
     }
 
+    // Reflection only load, may be useful when bringing into editor for component inspector values
+    // http://shazwazza.com/post/how-to-inspect-assemblies-before-including-them-in-your-application-with-reflection/
 
-    /*
-    void* hm;
+    // It’s best to execute all of this logic in a separate AppDomain because once assemblies are loaded
+    // in to a context, they cannot be unloaded and since we are loading in from files, those files will
+    // remain locked until the AppDomain is shutdown.
+
+    typedef void (*StartupFunction)();
+    StartupFunction startup;
+
+    // The coreclr binding model will become locked upon loading the first assembly that is not on the TPA list, or
+    // upon initializing the default context for the first time. For this test, test assemblies are located alongside
+    // corerun, and hence will be on the TPA list. So, we should be able to set the default context once successfully,
+    // and fail on the second try.
 
     st = sCreateDelegate(hostHandle_,
                     domainId_,
-                    "HelloWorld",
-                    "Hello1",
-                    "CallFromNative",
-                    &hm);
+                    "AtomicNETBootstrap",
+                    "AtomicLoadContext",
+                    "Startup",
+                    (void**) &startup);
 
     if (st >= 0)
     {
-        typedef void (*Hm)(const char* value);
-        ((Hm)hm)("Hello From Native");
+        startup();
     }
-    */
 
+    st = sCreateDelegate(hostHandle_,
+                    domainId_,
+                    "AtomicNETRuntime",
+                    "AtomicEngine.AtomicNETRuntime",
+                    "Startup",
+                    (void**) &startup);
 
-/*
+    if (st >= 0)
+    {
+        startup();
+    }
+
+    RefCountedDeletedFunction rcdFunction;
+
+    st = sCreateDelegate(hostHandle_,
+                    domainId_,
+                    "AtomicNETRuntime",
+                    "AtomicEngine.NativeCore",
+                    "RefCountedDeleted",
+                    (void**) &rcdFunction);
+
+    if (st >= 0)
+    {
+        RefCounted::SetRefCountedDeletedFunction(rcdFunction);
+    }
+
+    NETUpdateFunctionPtr updateFunction;
+
+    st = sCreateDelegate(hostHandle_,
+                    domainId_,
+                    "AtomicNETRuntime",
+                    "AtomicEngine.NativeCore",
+                    "NETUpdate",
+                    (void**) &updateFunction);
+
+    if (st >= 0)
+    {
+        GetSubsystem<NETManaged>()->SetNETUpdate(updateFunction);
+    }
+
+
+    /*
     unsigned int exitCode;
 
     st = sExecuteAssembly(
@@ -315,12 +393,20 @@ bool NETCore::Initialize(const String &coreCLRFilesAbsPath, String& errorMsg)
             0,
             "/Users/josh/Desktop/OSX.x64.Debug/HelloWorld.exe",
             (unsigned int*)&exitCode);
+    */
 
-*/
     return true;
 
 }
 
+void NETCore::HandleUpdate(StringHash eventType, VariantMap& eventData)
+{
+    using namespace Update;
+
+    GetSubsystem<NETManaged>()->NETUpdate(eventData[P_TIMESTEP].GetFloat());
+}
+
+
 void RegisterNETCoreLibrary(Context* context)
 {
     CSComponent::RegisterObject(context);

Source/AtomicNET/NETCore/NETCore.h

@@ -48,6 +48,7 @@ public:
 
 private:
 
+    void HandleUpdate(StringHash eventType, VariantMap& eventData);
     bool InitCoreCLRDLL(String &errorMsg);
     void GenerateTPAList(String& tpaList);
 

Source/AtomicNET/NETCore/NETCoreThunk.cpp

@@ -1,91 +0,0 @@
-
-#include "NETCore.h"
-#include "NETManaged.h"
-#include "NETCoreThunk.h"
-
-
-namespace Atomic
-{
-
-static AtomicNETCoreThunk_t AtomicNETCoreThunk;
-
-void Atomic_NETManaged_SetCSComponentCreate(CSComponentCreateFunctionPtr method)
-{
-    NETCore::GetContext()->GetSubsystem<NETManaged>()->SetCSComponentCreate(method);
-}
-
-
-void Atomic_NETManaged_SetCSComponentCallMethod(CSComponentCallMethodFunctionPtr method)
-{
-    NETCore::GetContext()->GetSubsystem<NETManaged>()->SetCSComponentCallMethod(method);
-}
-
-// Event Handling
-
-void Atomic_NETManaged_SetCSBeginSendEvent(CSBeginSendEventFunctionPtr method)
-{
-    NETCore::GetContext()->GetSubsystem<NETManaged>()->SetCSBeginSendEvent(method);
-}
-
-void Atomic_AObject_SendEvent(Object* object, const char* eventType)
-{
-    object->SendEvent(eventType);
-}
-
-ClassID Atomic_RefCounted_GetClassID(RefCounted* refCounted)
-{
-    if (!refCounted)
-        return 0;
-
-    return refCounted->GetClassID();
-}
-
-RefCounted* AtomicEngine_GetSubsystem(const char* name)
-{
-    return NETCore::GetContext()->GetSubsystem(name);
-}
-
-void Atomic_RefCounted_SafeAddRef(unsigned id)
-{
-    RefCounted* ref = RefCounted::GetByID(id);
-    if (ref)
-        ref->AddRef();
-
-}
-
-void Atomic_RefCounted_SafeReleaseRef(unsigned id)
-{
-    RefCounted* ref = RefCounted::GetByID(id);
-    if (ref)
-        ref->ReleaseRef();
-}
-
-unsigned Atomic_StringToStringHash(const char* stringValue)
-{
-    StringHash hash = stringValue;
-    return hash.Value();
-}
-
-// Variant Map
-RefCounted* Atomic_VariantMap_GetInstance(VariantMap& vmap, const char* key)
-{
-    return vmap[key].GetPtr();
-}
-
-void NetCoreThunkInit()
-{
-    AtomicNETCoreThunk.__Atomic_NETManaged_SetCSBeginSendEvent = Atomic_NETManaged_SetCSBeginSendEvent;
-    AtomicNETCoreThunk.__Atomic_NETManaged_SetCSComponentCallMethod = Atomic_NETManaged_SetCSComponentCallMethod;
-    AtomicNETCoreThunk.__Atomic_NETManaged_SetCSComponentCreate = Atomic_NETManaged_SetCSComponentCreate;
-
-    AtomicNETCoreThunk.__Atomic_AObject_SendEvent = Atomic_AObject_SendEvent;
-
-    AtomicNETCoreThunk.__AtomicEngine_GetSubsystem = AtomicEngine_GetSubsystem;
-    AtomicNETCoreThunk.__Atomic_StringToStringHash = Atomic_StringToStringHash;
-    AtomicNETCoreThunk.__Atomic_VariantMap_GetInstance = Atomic_VariantMap_GetInstance;
-    AtomicNETCoreThunk.__Atomic_RefCounted_SafeAddRef = Atomic_RefCounted_SafeAddRef;
-    AtomicNETCoreThunk.__Atomic_RefCounted_SafeReleaseRef = Atomic_RefCounted_SafeReleaseRef;
-    AtomicNETCoreThunk.__Atomic_RefCounted_GetClassID = Atomic_RefCounted_GetClassID;
-}
-
-}

Source/AtomicNET/NETCore/NETCoreThunk.h

@@ -1,66 +0,0 @@
-
-#pragma once
-
-#include "CSComponent.h"
-
-namespace Atomic
-{
-
-typedef CSComponent* (*CSComponentCreateFunctionPtr)(const char* csComponentTypeName);
-typedef void (*CSComponentCallMethodFunctionPtr)(unsigned id, CSComponentMethod method, float value);
-typedef void (*CSBeginSendEventFunctionPtr)(unsigned senderRefID, unsigned eventType, VariantMap* eventData);
-
-typedef void (*Atomic_NETManaged_SetCSComponentCreate_Function)(CSComponentCreateFunctionPtr ptr);
-typedef void (*Atomic_NETManaged_SetCSComponentCallMethod_Function)(CSComponentCallMethodFunctionPtr ptr);
-typedef void (*Atomic_NETManaged_SetCSBeginSendEvent_Function)(CSBeginSendEventFunctionPtr ptr);
-
-typedef void (*Atomic_AObject_SendEvent_Function)(Object* object, const char* eventType);
-
-typedef RefCounted* (*AtomicEngine_GetSubsystem_Function)(const char* name);
-typedef unsigned (*Atomic_StringToStringHash_Function)(const char* stringValue);
-typedef RefCounted* (*Atomic_VariantMap_GetInstance_Function)(VariantMap& vmap, const char* key);
-typedef void (*Atomic_RefCounted_SafeAddRef_Function)(unsigned id);
-typedef void (*Atomic_RefCounted_SafeReleaseRef_Function)(unsigned id);
-typedef ClassID (*Atomic_RefCounted_GetClassID_Function)(RefCounted* refCounted);
-
-typedef struct AtomicNETCoreThunk_s
-{
-    Atomic_NETManaged_SetCSComponentCreate_Function __Atomic_NETManaged_SetCSComponentCreate;
-    Atomic_NETManaged_SetCSComponentCallMethod_Function __Atomic_NETManaged_SetCSComponentCallMethod;
-    Atomic_NETManaged_SetCSBeginSendEvent_Function __Atomic_NETManaged_SetCSBeginSendEvent;
-
-    Atomic_AObject_SendEvent_Function __Atomic_AObject_SendEvent;
-
-    AtomicEngine_GetSubsystem_Function __AtomicEngine_GetSubsystem;
-    Atomic_StringToStringHash_Function __Atomic_StringToStringHash;
-    Atomic_VariantMap_GetInstance_Function __Atomic_VariantMap_GetInstance;
-    Atomic_RefCounted_SafeAddRef_Function __Atomic_RefCounted_SafeAddRef;
-    Atomic_RefCounted_SafeReleaseRef_Function __Atomic_RefCounted_SafeReleaseRef;
-    Atomic_RefCounted_GetClassID_Function __Atomic_RefCounted_GetClassID;
-
-} AtomicNETCoreThunk_t;
-
-void NetCoreThunkInit();
-
-void Atomic_NETManaged_SetCSComponentCreate(CSComponentCreateFunctionPtr method);
-
-void Atomic_NETManaged_SetCSComponentCallMethod(CSComponentCallMethodFunctionPtr method);
-
-void Atomic_NETManaged_SetCSBeginSendEvent(CSBeginSendEventFunctionPtr method);
-
-void Atomic_AObject_SendEvent(Object* object, const char* eventType);
-
-ClassID Atomic_RefCounted_GetClassID(RefCounted* refCounted);
-
-RefCounted* AtomicEngine_GetSubsystem(const char* name);
-
-void Atomic_RefCounted_SafeAddRef(unsigned id);
-
-void Atomic_RefCounted_SafeReleaseRef(unsigned id);
-
-unsigned Atomic_StringToStringHash(const char* stringValue);
-
-// Variant Map
-RefCounted* Atomic_VariantMap_GetInstance(VariantMap& vmap, const char* key);
-
-}

Source/AtomicNET/NETCore/NETManaged.cpp

@@ -17,7 +17,8 @@ NETManaged::NETManaged(Context* context) :
     Object(context),
     CSComponentCreate_(0),
     CSComponentCallMethod_(0),
-    CSBeginSendEvent_(0)
+    CSBeginSendEvent_(0),
+    NETUpdate_(0)
 {
 }
 
@@ -26,6 +27,19 @@ NETManaged::~NETManaged()
 
 }
 
+void NETManaged::SetNETUpdate(NETUpdateFunctionPtr ptr)
+{
+    NETUpdate_ = ptr;
+}
+
+void NETManaged::NETUpdate(float timeStep)
+{
+    if (!NETUpdate_)
+        return;
+
+    NETUpdate_(timeStep);
+}
+
 CSComponent* NETManaged::CSComponentCreate(const String& componentName)
 {
     if (!CSComponentCreate_)

Source/AtomicNET/NETCore/NETManaged.h

@@ -25,11 +25,17 @@
 #include <Atomic/Core/Context.h>
 #include <Atomic/Core/Object.h>
 
-#include "NETCoreThunk.h"
+#include "CSComponent.h"
 
 namespace Atomic
 {
 
+typedef void (*NETUpdateFunctionPtr)(float timeStep);
+
+typedef CSComponent* (*CSComponentCreateFunctionPtr)(const char* csComponentTypeName);
+typedef void (*CSComponentCallMethodFunctionPtr)(unsigned id, CSComponentMethod method, float value);
+typedef void (*CSBeginSendEventFunctionPtr)(unsigned senderRefID, unsigned eventType, VariantMap* eventData);
+
 class ATOMIC_API NETManaged : public Object
 {
     OBJECT(NETManaged);
@@ -40,10 +46,14 @@ public:
     /// Destruct.
     virtual ~NETManaged();
 
+    void SetNETUpdate(NETUpdateFunctionPtr ptr);
+
     void SetCSComponentCreate(CSComponentCreateFunctionPtr ptr);
     void SetCSComponentCallMethod(CSComponentCallMethodFunctionPtr ptr);
     void SetCSBeginSendEvent(CSBeginSendEventFunctionPtr ptr);
 
+    void NETUpdate(float timeStep);
+
     CSComponent* CSComponentCreate(const String& componentName);
     void CSComponentCallMethod(unsigned id, CSComponentMethod methodID, float value = 0.0f);
     void CSBeginSendEvent(unsigned senderRefID, unsigned eventType, VariantMap* eventData);
@@ -53,6 +63,7 @@ private:
     CSComponentCreateFunctionPtr CSComponentCreate_;
     CSComponentCallMethodFunctionPtr CSComponentCallMethod_;
     CSBeginSendEventFunctionPtr CSBeginSendEvent_;
+    NETUpdateFunctionPtr NETUpdate_;
 
 };
 

Source/AtomicNET/NETNative/AtomicSharpAPI.cpp

@@ -1,174 +0,0 @@
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-
-#include <AtomicNET/NETCore/NETCore.h>
-#include <AtomicNET/NETCore/NETManaged.h>
-#include <AtomicNET/NETCore/NETCoreThunk.h>
-#include <AtomicNET/NETCore/CSScriptObject.h>
-
-#include "AtomicSharpAPI.h"
-
-#ifdef ATOMIC_PLATFORM_WINDOWS
-#pragma warning(disable: 4244) // possible loss of data
-#define ATOMIC_EXPORT_API __declspec(dllexport)
-#else
-#define ATOMIC_EXPORT_API
-#endif
-
-using namespace Atomic;
-
-static AtomicNETCoreThunk_t AtomicNETCoreThunk;
-static bool AtomicNETCoreThunkEnabled = false;
-
-extern "C"
-{
-
-ATOMIC_EXPORT_API void csb_package_set_Atomic_NETCore_thunk(AtomicNETCoreThunk_t* thunkIn)
-{
-    AtomicNETCoreThunk = *thunkIn;
-    AtomicNETCoreThunkEnabled = true;
-}
-
-ATOMIC_EXPORT_API void csb_AtomicEngine_AtomicInterop_Set_CSComponentCreate(CSComponentCreateFunctionPtr method)
-{
-    if (AtomicNETCoreThunkEnabled)
-    {
-        AtomicNETCoreThunk.__Atomic_NETManaged_SetCSComponentCreate(method);
-    }
-    else
-    {
-        Atomic_NETManaged_SetCSComponentCreate(method);
-    }
-}
-
-
-ATOMIC_EXPORT_API void csb_AtomicEngine_AtomicInterop_Set_CSComponentCallMethod(CSComponentCallMethodFunctionPtr method)
-{
-    if (AtomicNETCoreThunkEnabled)
-    {
-        AtomicNETCoreThunk.__Atomic_NETManaged_SetCSComponentCallMethod(method);
-    }
-    else
-    {
-        Atomic_NETManaged_SetCSComponentCallMethod(method);
-    }
-}
-
-// Event Handling
-
-ATOMIC_EXPORT_API void csb_AtomicEngine_AtomicInterop_Set_CSBeginSendEvent(CSBeginSendEventFunctionPtr method)
-{
-    if (AtomicNETCoreThunkEnabled)
-    {
-        AtomicNETCoreThunk.__Atomic_NETManaged_SetCSBeginSendEvent(method);
-    }
-    else
-    {
-        Atomic_NETManaged_SetCSBeginSendEvent(method);
-    }
-
-}
-
-// Instance methods
-
-ATOMIC_EXPORT_API void csb_Atomic_AObject_SendEvent(Object* object, const char* eventType)
-{
-    if (AtomicNETCoreThunkEnabled)
-    {
-        AtomicNETCoreThunk.__Atomic_AObject_SendEvent(object, eventType);
-    }
-    else
-    {
-        Atomic_AObject_SendEvent(object, eventType);
-    }
-}
-
-
-ATOMIC_EXPORT_API ClassID csb_Atomic_RefCounted_GetClassID(RefCounted* refCounted)
-{
-    if (AtomicNETCoreThunkEnabled)
-    {
-        return AtomicNETCoreThunk.__Atomic_RefCounted_GetClassID(refCounted);
-    }
-    else
-    {
-        return Atomic_RefCounted_GetClassID(refCounted);
-    }
-}
-
-ATOMIC_EXPORT_API RefCounted* csb_AtomicEngine_GetSubsystem(const char* name)
-{
-    if (AtomicNETCoreThunkEnabled)
-    {
-        return AtomicNETCoreThunk.__AtomicEngine_GetSubsystem(name);
-    }
-    else
-    {
-        return AtomicEngine_GetSubsystem(name);
-    }
-}
-
-ATOMIC_EXPORT_API void csb_Atomic_RefCounted_SafeAddRef(unsigned id)
-{
-    if (AtomicNETCoreThunkEnabled)
-    {
-        AtomicNETCoreThunk.__Atomic_RefCounted_SafeAddRef(id);
-    }
-    else
-    {
-        Atomic_RefCounted_SafeAddRef(id);
-    }
-
-}
-
-ATOMIC_EXPORT_API void csb_Atomic_RefCounted_SafeReleaseRef(unsigned id)
-{
-    if (AtomicNETCoreThunkEnabled)
-    {
-        AtomicNETCoreThunk.__Atomic_RefCounted_SafeReleaseRef(id);
-    }
-    else
-    {
-        Atomic_RefCounted_SafeReleaseRef(id);
-    }
-
-}
-
-ATOMIC_EXPORT_API unsigned csb_Atomic_StringToStringHash(const char* stringValue)
-{
-    if (AtomicNETCoreThunkEnabled)
-    {
-        return AtomicNETCoreThunk.__Atomic_StringToStringHash(stringValue);
-    }
-    else
-    {
-        return Atomic_StringToStringHash(stringValue);
-    }
-}
-
-// Variant Map
-
-ATOMIC_EXPORT_API RefCounted* csb_Atomic_VariantMap_GetInstance(VariantMap& vmap, const char* key)
-{
-    if (AtomicNETCoreThunkEnabled)
-    {
-        return AtomicNETCoreThunk.__Atomic_VariantMap_GetInstance(vmap, key);
-    }
-    else
-    {
-        return Atomic_VariantMap_GetInstance(vmap, key);
-    }
-
-}
-
-}

Source/ToolCore/JSBind/CSharp/CSFunctionWriter.cpp

@@ -154,48 +154,6 @@ void CSFunctionWriter::GenNativeCallParameters(String& sig)
     sig.Join(args, ", ");
 }
 
-void CSFunctionWriter::GenNativeThunkCallParameters(String& sig)
-{
-    Vector<JSBFunctionType*>& parameters = function_->GetParameters();
-
-    Vector<String> args;
-
-    if (!function_->IsConstructor())
-        args.Push("self");
-
-    if (parameters.Size())
-    {
-        for (unsigned int i = 0; i < parameters.Size(); i++)
-        {
-            JSBFunctionType* ptype = parameters.At(i);
-
-            // ignore "Context" parameters
-            if (ptype->type_->asClassType())
-            {
-                JSBClassType* classType = ptype->type_->asClassType();
-                JSBClass* klass = classType->class_;
-                if (klass->GetName() == "Context")
-                {
-                    continue;
-                }
-
-                args.Push(ToString("%s", ptype->name_.CString()));
-
-            }
-            else
-            {
-                args.Push(ToString("%s", ptype->name_.CString()));
-            }
-
-        }
-    }
-
-    if (function_->GetReturnClass() && function_->GetReturnClass()->IsNumberArray())
-        args.Push("returnValue");
-
-    sig.Join(args, ", ");
-}
-
 void CSFunctionWriter::WriteNativeFunction(String& source)
 {
     JSBClass* klass = function_->GetClass();
@@ -219,36 +177,6 @@ void CSFunctionWriter::WriteNativeFunction(String& source)
 
     source += "\n";
 
-    line = ToString("if ( AtomicNET%sThunkEnabled )\n", package->GetName().CString());
-
-    source += IndentLine(line);
-
-    source += IndentLine("{\n");
-
-    Indent();
-
-    // write the thunk
-
-    line = returnType == "void" ? "" : "return ";
-
-    String thunkCallSig;
-    GenNativeThunkCallParameters(thunkCallSig);
-
-    line += ToString("AtomicNET%sThunk.__%s_%s_%s(%s);\n", package->GetName().CString(), package->GetName().CString(), klass->GetName().CString(),
-                     fname.CString(), thunkCallSig.CString());
-
-    source += IndentLine(line);
-
-    Dedent();
-
-    source += IndentLine("}\n");
-
-    source += IndentLine("else\n");
-
-    source += IndentLine("{\n");
-
-    Indent();
-
     bool returnValue = false;
     bool sharedPtrReturn = false;
 
@@ -316,10 +244,6 @@ void CSFunctionWriter::WriteNativeFunction(String& source)
 
     source += IndentLine("}\n");
 
-    Dedent();
-
-    source += IndentLine("}\n");
-
     source += "\n";
 
 }

Source/ToolCore/JSBind/CSharp/CSFunctionWriter.h

@@ -46,8 +46,6 @@ private:
     void WriteDefaultStructParameters(String& source);
 
     void GenNativeCallParameters(String& sig);
-    void GenNativeThunkCallParameters(String& sig);
-
 
     void WriteNativeFunction(String& source);
     void WriteNativeConstructor(String& source);

Source/ToolCore/JSBind/CSharp/CSModuleWriter.cpp

@@ -81,54 +81,6 @@ void CSModuleWriter::WriteIncludes(String& source)
 
 }
 
-void CSModuleWriter::GenerateNativeThunkInit(String& sourceOut)
-{
-    const char* packageName = module_->GetPackage()->GetName().CString();
-    const char* moduleName = module_->GetName().CString();
-
-    String source, line;
-    String thunkName = ToString("AtomicNET%sThunk",packageName);
-
-    source.AppendWithFormat("\nvoid csb_package_%s_init_%s_thunk ()\n{\n\n", packageName, moduleName);
-
-    Vector<SharedPtr<JSBClass>> classes = module_->classes_.Values();
-
-    Indent();
-
-    for (unsigned i = 0; i < classes.Size(); i++)
-    {
-        JSBClass* cls = classes[i];
-
-        if (cls->IsNumberArray())
-            continue;
-
-        PODVector<JSBFunction*> functions = cls->GetFunctions();
-        for (unsigned j = 0; j < functions.Size(); j++)
-        {
-            JSBFunction* function = functions[j];
-            if (CSTypeHelper::OmitFunction(function))
-                continue;
-
-             line = ToString("%s.__%s_%s_%s = ", thunkName.CString(), packageName, cls->GetName().CString(),
-                             function->IsConstructor() ? "Constructor" : function->GetName().CString());
-
-             line += ToString("csb_%s_%s_%s;\n", packageName, cls->GetName().CString(),
-                             function->IsConstructor() ? "Constructor" : function->GetName().CString());
-
-             source += IndentLine(line);
-
-        }
-
-    }
-
-    Dedent();
-
-    source += "\n}\n";
-
-    sourceOut += source;
-
-}
-
 void CSModuleWriter::GenerateNativeSource()
 {
     String source = "// This file was autogenerated by JSBind, changes will be lost\n";
@@ -176,8 +128,6 @@ void CSModuleWriter::GenerateNativeSource()
 
     source += "// End Classes\n\n";
 
-    GenerateNativeThunkInit(source);
-
     // end Atomic namespace
     source += "\n}\n";
 

Source/ToolCore/JSBind/CSharp/CSModuleWriter.h

@@ -33,8 +33,6 @@ public:
 
 private:
 
-    void GenerateNativeThunkInit(String& sourceOut);
-
     String GetManagedPrimitiveType(JSBPrimitiveType* ptype);
 
     void GenerateManagedModuleClass(String& sourceOut);

Source/ToolCore/JSBind/CSharp/CSPackageWriter.cpp

@@ -28,59 +28,6 @@ CSPackageWriter::CSPackageWriter(JSBPackage *package) : JSBPackageWriter(package
 
 }
 
-void CSPackageWriter::GenerateNativeFunctionThunk(String& sourceOut)
-{
-    String source, line;
-
-    source += IndentLine(ToString("\n\ntypedef struct AtomicNET%sThunk_s\n", package_->GetName().CString()));
-
-    source += IndentLine("{\n");
-
-    Indent();
-
-    PODVector<JSBClass*>& allClasses = package_->GetAllClasses();
-    for (unsigned i = 0; i < allClasses.Size(); i++)
-    {
-        JSBClass* cls = allClasses[i];
-
-        PODVector<JSBFunction*>& functions = cls->GetFunctions();
-
-        for (unsigned j = 0; j < functions.Size(); j++)
-        {
-            JSBFunction* function = functions[j];
-
-            if (!CSTypeHelper::OmitFunction(function))
-            {
-                JSBClass* cls = function->GetClass();
-                JSBPackage* package = cls->GetPackage();
-
-                line = ToString("%s_%s_%s_Function ", package->GetName().CString(),
-                                cls->GetName().CString(),
-                                function->IsConstructor() ? "Constructor" : function->GetName().CString());
-
-                line += ToString("__%s_%s_%s;\n", package->GetName().CString(),
-                                cls->GetName().CString(),
-                                function->IsConstructor() ? "Constructor" : function->GetName().CString());
-
-                source += IndentLine(line);
-
-            }
-        }
-    }
-
-    Dedent();
-
-    const char* packageName = package_->GetName().CString();
-
-    source += IndentLine(ToString("\n} AtomicNET%sThunk_t;\n",packageName));
-
-    source += IndentLine(ToString("extern AtomicNET%sThunk_t AtomicNET%sThunk;\n", packageName, packageName));
-
-    source += IndentLine(ToString("extern bool AtomicNET%sThunkEnabled;\n", packageName));
-
-    sourceOut += source;
-}
-
 void CSPackageWriter::GenNativeFunctionSignature(JSBFunction* function, String& sig)
 {
     JSBClass* klass = function->GetClass();
@@ -129,41 +76,6 @@ void CSPackageWriter::GenNativeFunctionSignature(JSBFunction* function, String&
 
 }
 
-void CSPackageWriter::GenerateNativeFunctionTypeDefs(String& sourceOut)
-{
-    // call typedefs
-
-    Indent();
-
-    String source, line;
-
-    PODVector<JSBClass*>& allClasses = package_->GetAllClasses();
-    for (unsigned i = 0; i < allClasses.Size(); i++)
-    {
-        JSBClass* cls = allClasses[i];
-
-        PODVector<JSBFunction*>& functions = cls->GetFunctions();
-
-        for (unsigned j = 0; j < functions.Size(); j++)
-        {
-            JSBFunction* function = functions[j];
-            String returnType;
-            line = CSTypeHelper::GetNativeFunctionSignature(function, returnType, true);
-            if (line.Length())
-            {
-                line += ";\n";
-                source += IndentLine(line);
-            }
-        }
-
-    }
-
-    Indent();
-
-    sourceOut += source;
-
-}
-
 void CSPackageWriter::GenerateNativeHeader()
 {
     String source = "// This file was autogenerated by AtomicTool, changes will be lost\n\n";
@@ -221,9 +133,6 @@ void CSPackageWriter::GenerateNativeHeader()
 
     Dedent();
 
-    GenerateNativeFunctionTypeDefs(source);
-    GenerateNativeFunctionThunk(source);
-
     source += "\n}\n";
 
     JSBind* jsbind = package_->GetSubsystem<JSBind>();
@@ -237,53 +146,6 @@ void CSPackageWriter::GenerateNativeHeader()
 
 }
 
-
-void CSPackageWriter::GenerateNativeThunkInit(String& sourceOut)
-{
-    const char* packageName = package_->GetName().CString();
-
-    String source, line;
-
-    for (unsigned i = 0; i < package_->modules_.Size(); i++)
-    {
-        JSBModule* module = package_->modules_[i];
-        const char* moduleName = module->GetName().CString();
-        source.AppendWithFormat("extern \"C\" void csb_package_%s_init_%s_thunk ();\n", packageName, moduleName);
-    }
-
-    source.AppendWithFormat("\nvoid csb_package_init_%s_thunk ()\n{\n\n", packageName);
-
-    Indent();
-
-    for (unsigned i = 0; i < package_->modules_.Size(); i++)
-    {
-        JSBModule* module = package_->modules_[i];
-        const char* moduleName = module->GetName().CString();
-        line = ToString("csb_package_%s_init_%s_thunk ();\n", packageName, moduleName);
-        source += IndentLine(line);
-    }
-
-    Dedent();
-
-    source.Append("\n}\n");
-
-    // Thunk Setter
-
-    String thunkType = ToString("AtomicNET%sThunk_t", packageName);
-    source += ToString("extern \"C\" void csb_package_set_%s_thunk (const %s *thunkIn)\n{\n", packageName, thunkType.CString());
-
-    Indent();
-
-    source += IndentLine(ToString("AtomicNET%sThunk = *thunkIn;\n", packageName));
-    source += IndentLine(ToString("AtomicNET%sThunkEnabled = true;\n", packageName));
-
-    Dedent();
-
-    source += ToString("\n}\n");
-
-    sourceOut += source;
-
-}
 void CSPackageWriter::GenerateNativeSource()
 {
     GenerateNativeHeader();
@@ -304,15 +166,9 @@ void CSPackageWriter::GenerateNativeSource()
 
     source += ToString("namespace %s\n{\n", packageName);
 
-    // thunk
-    source += ToString("AtomicNET%sThunk_t AtomicNET%sThunk;\n", packageName, packageName);
-    source += ToString("bool AtomicNET%sThunkEnabled = false;\n", packageName);
-
     // end of namespace
     source += "\n}\n";
 
-    GenerateNativeThunkInit(source);
-
     JSBind* jsbind = package_->GetSubsystem<JSBind>();
 
     String filepath = jsbind->GetDestNativeFolder() + "/CSPackage" + package_->name_ + ".cpp";

Source/ToolCore/JSBind/CSharp/CSPackageWriter.h

@@ -30,10 +30,7 @@ public:
     void GenerateSource();
 
     void GenNativeFunctionSignature(JSBFunction* function, String& sig);
-    void GenerateNativeFunctionTypeDefs(String& sourceOut);
-    void GenerateNativeFunctionThunk(String& sourceOut);
 
-    void GenerateNativeThunkInit(String& sourceOut);
     void GenerateNativeHeader();
     void GenerateNativeSource();
     void GenerateManagedSource();

Source/ToolCore/JSBind/CSharp/CSTypeHelper.cpp

@@ -54,7 +54,7 @@ void CSTypeHelper::GenNativeFunctionParameterSignature(JSBFunction* function, St
 
 }
 
-String CSTypeHelper::GetNativeFunctionSignature(JSBFunction* function, String& returnType, bool thunk)
+String CSTypeHelper::GetNativeFunctionSignature(JSBFunction* function, String& returnType)
 {
 
     if (function->Skip())
@@ -103,19 +103,9 @@ String CSTypeHelper::GetNativeFunctionSignature(JSBFunction* function, String& r
     String sig;
     GenNativeFunctionParameterSignature(function, sig);
 
-    String functionSig;
-    if (!thunk)
-    {
-        functionSig = ToString("csb_%s_%s_%s(%s)",
-                    package->GetName().CString(), klass->GetName().CString(),
-                    fname.CString(), sig.CString());
-    }
-    else
-    {
-        functionSig = ToString("typedef %s (*%s_%s_%s_Function)(%s)",
-                    returnType.CString(), package->GetName().CString(), klass->GetName().CString(),
-                    fname.CString(), sig.CString());
-    }
+    String functionSig = ToString("csb_%s_%s_%s(%s)",
+                package->GetName().CString(), klass->GetName().CString(),
+                fname.CString(), sig.CString());
 
     return functionSig;
 }

Source/ToolCore/JSBind/CSharp/CSTypeHelper.h

@@ -24,7 +24,7 @@ public:
 
     static void GenNativeFunctionParameterSignature(JSBFunction* function, String& sig);
 
-    static String GetNativeFunctionSignature(JSBFunction* function, String& returnType, bool thunk = false);
+    static String GetNativeFunctionSignature(JSBFunction* function, String& returnType);
 
     static bool IsSimpleReturn(JSBType* type);
     static bool IsSimpleReturn(JSBFunctionType* ftype);