Initial il2cpp support attempts

examples/button-clicker/Assets/DiscordController.cs

@@ -9,17 +9,30 @@ public class DiscordSpectateEvent : UnityEngine.Events.UnityEvent<string> { }
 [System.Serializable]
 public class DiscordJoinRequestEvent : UnityEngine.Events.UnityEvent<DiscordRpc.DiscordUser> { }
 
+public class GameManager {
+  private static GameManager instance = null;
+  public static GameManager Instance {
+    get
+    {
+      if (instance == null)
+      {
+        instance = new GameManager();
+      }
+      return instance;
+    }
+  }
+  public UnityEngine.Events.UnityEvent onConnect;
+  public UnityEngine.Events.UnityEvent onDisconnect;
+  public UnityEngine.Events.UnityEvent hasResponded;
+  public DiscordRpc.DiscordUser joinRequest;
+}
+
 public class DiscordController : MonoBehaviour
 {
   public DiscordRpc.RichPresence presence = new DiscordRpc.RichPresence();
   public string applicationId;
   public string optionalSteamId;
-    public int callbackCalls;
   public int clickCounter;
-    public DiscordRpc.DiscordUser joinRequest;
-    public UnityEngine.Events.UnityEvent onConnect;
-    public UnityEngine.Events.UnityEvent onDisconnect;
-    public UnityEngine.Events.UnityEvent hasResponded;
   public DiscordJoinEvent onJoin;
   public DiscordJoinEvent onSpectate;
   public DiscordJoinRequestEvent onJoinRequest;
@@ -30,66 +43,58 @@ public class DiscordController : MonoBehaviour
   {
     Debug.Log("Discord: on click!");
     clickCounter++;
-
     presence.details = string.Format("Button clicked {0} times", clickCounter);
-
     DiscordRpc.UpdatePresence(presence);
   }
 
-    public void RequestRespondYes()
+  public static void RequestRespondYes()
   {
     Debug.Log("Discord: responding yes to Ask to Join request");
-        DiscordRpc.Respond(joinRequest.userId, DiscordRpc.Reply.Yes);
+    DiscordRpc.Respond(GameManager.Instance.joinRequest.userId, DiscordRpc.Reply.Yes);
-        hasResponded.Invoke();
+    // hasResponded.Invoke();
   }
 
-    public void RequestRespondNo()
+  public static void RequestRespondNo()
   {
     Debug.Log("Discord: responding no to Ask to Join request");
-        DiscordRpc.Respond(joinRequest.userId, DiscordRpc.Reply.No);
+    DiscordRpc.Respond(GameManager.Instance.joinRequest.userId, DiscordRpc.Reply.No);
-        hasResponded.Invoke();
+    // hasResponded.Invoke();
   }
 
-    public void ReadyCallback(ref DiscordRpc.DiscordUser connectedUser)
+  public static void ReadyCallback(ref DiscordRpc.DiscordUser connectedUser)
   {
-        ++callbackCalls;
     Debug.Log(string.Format("Discord: connected to {0}#{1}: {2}", connectedUser.username, connectedUser.discriminator, connectedUser.userId));
-        onConnect.Invoke();
+    // GameManager.Instance.onConnect.Invoke();
   }
 
-    public void DisconnectedCallback(int errorCode, string message)
+  public static void DisconnectedCallback(int errorCode, string message)
   {
-        ++callbackCalls;
     Debug.Log(string.Format("Discord: disconnect {0}: {1}", errorCode, message));
-        onDisconnect.Invoke();
+    // onDisconnect.Invoke();
   }
 
-    public void ErrorCallback(int errorCode, string message)
+  public static void ErrorCallback(int errorCode, string message)
   {
-        ++callbackCalls;
     Debug.Log(string.Format("Discord: error {0}: {1}", errorCode, message));
   }
 
-    public void JoinCallback(string secret)
+  public static void JoinCallback(string secret)
   {
-        ++callbackCalls;
     Debug.Log(string.Format("Discord: join ({0})", secret));
-        onJoin.Invoke(secret);
+    // onJoin.Invoke(secret);
   }
 
-    public void SpectateCallback(string secret)
+  public static void SpectateCallback(string secret)
   {
-        ++callbackCalls;
     Debug.Log(string.Format("Discord: spectate ({0})", secret));
-        onSpectate.Invoke(secret);
+    // onSpectate.Invoke(secret);
   }
 
-    public void RequestCallback(ref DiscordRpc.DiscordUser request)
+  public static void RequestCallback(ref DiscordRpc.DiscordUser request)
   {
-        ++callbackCalls;
     Debug.Log(string.Format("Discord: join request {0}#{1}: {2}", request.username, request.discriminator, request.userId));
-        joinRequest = request;
+    GameManager.Instance.joinRequest = request;
-        onJoinRequest.Invoke(request);
+    // onJoinRequest.Invoke(request);
   }
 
   void Start()
@@ -104,10 +109,8 @@ public class DiscordController : MonoBehaviour
   void OnEnable()
   {
     Debug.Log("Discord: init");
-        callbackCalls = 0;
-
     handlers = new DiscordRpc.EventHandlers();
-        handlers.readyCallback = ReadyCallback;
+    handlers.readyCallback += ReadyCallback;
     handlers.disconnectedCallback += DisconnectedCallback;
     handlers.errorCallback += ErrorCallback;
     handlers.joinCallback += JoinCallback;

examples/button-clicker/Assets/DiscordRpc.cs

@@ -2,35 +2,42 @@
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Text;
+using AOT;
 
 public class DiscordRpc
 {
-    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+    [MonoPInvokeCallback(typeof(OnReadyInfo))]
-    public delegate void ReadyCallback(ref DiscordUser connectedUser);
+    public static void ReadyCallback(ref DiscordUser user){}
+    public delegate void OnReadyInfo(ref DiscordUser connectedUser);
 
-    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+    [MonoPInvokeCallback(typeof(OnDisconnectedInfo))]
-    public delegate void DisconnectedCallback(int errorCode, string message);
+    public static void DisconnectedCallback(int errorCode, string message){}
+    public delegate void OnDisconnectedInfo(int errorCode, string message);
 
-    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+    [MonoPInvokeCallback(typeof(OnErrorInfo))]
-    public delegate void ErrorCallback(int errorCode, string message);
+    public static void ErrorCallback(int errorCode, string message){}
+    public delegate void OnErrorInfo(int errorCode, string message);
 
-    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+    [MonoPInvokeCallback(typeof(OnJoinInfo))]
-    public delegate void JoinCallback(string secret);
+    public static void JoinCallback(string secret){}
+    public delegate void OnJoinInfo(string secret);
 
-    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+    [MonoPInvokeCallback(typeof(OnSpectateInfo))]
-    public delegate void SpectateCallback(string secret);
+    public static void SpectateCallback(string secret){}
+    public delegate void OnSpectateInfo(string secret);
 
-    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+    [MonoPInvokeCallback(typeof(OnRequestInfo))]
-    public delegate void RequestCallback(ref DiscordUser request);
+    public static void RequestCallback(ref DiscordUser request){}
+    public delegate void OnRequestInfo(ref DiscordUser request);
 
     public struct EventHandlers
     {
-        public ReadyCallback readyCallback;
+        public OnReadyInfo readyCallback;
-        public DisconnectedCallback disconnectedCallback;
+        public OnDisconnectedInfo disconnectedCallback;
-        public ErrorCallback errorCallback;
+        public OnErrorInfo errorCallback;
-        public JoinCallback joinCallback;
+        public OnJoinInfo joinCallback;
-        public SpectateCallback spectateCallback;
+        public OnSpectateInfo spectateCallback;
-        public RequestCallback requestCallback;
+        public OnRequestInfo requestCallback;
     }
 
     [Serializable, StructLayout(LayoutKind.Sequential)]