ndepoel
/
uniquake
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Split off native interop code for the main UniQuake class into a separate partial class file as well

console
Nico de Poel 5 years ago
parent
12faa0c8a1
commit
64b4ac812b
3 changed files with 87 additions and 78 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 78
      Assets/Scripts/UniQuake.Interop.cs
  2. 3
      Assets/Scripts/UniQuake.Interop.cs.meta
  3. 84
      Assets/Scripts/UniQuake.cs

78
Assets/Scripts/UniQuake.Interop.cs
View File

@ -0,0 +1,78 @@
using System;
using System.IO;
using System.Runtime.InteropServices;
using UnityEngine;
public partial class UniQuake
{
#if UNITY_EDITOR
private const string DllPath = "Plugins/windows/x86_64/uniquake.dll";
#elif UNITY_STANDALONE_WIN
#if UNITY_64
private const string DllPath = "Plugins/x86_64/uniquake.dll";
#else
private const string DllPath = "Plugins/x86/uniquake.dll";
#endif
#endif
private IntPtr libraryHandle;
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
private delegate void UniQuake_InitFunc(IntPtr parms, IntPtr sysCalls, IntPtr glCalls);
private UniQuake_InitFunc UniQuake_Init;
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
private delegate void UniQuake_UpdateFunc(float deltaTime);
private UniQuake_UpdateFunc UniQuake_Update;
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
private delegate void UniQuake_ShutdownFunc();
private UniQuake_ShutdownFunc UniQuake_Shutdown;
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
private delegate void UniQuake_SetFmodSystemFunc(IntPtr fmodSystem);
private UniQuake_SetFmodSystemFunc UniQuake_SetFmodSystem;
private void LoadLibrary()
{
string dllFile = Path.Combine(Application.dataPath, DllPath);
// Experimental code to allow running multiple instances of Quake next to each other
// string dllName = Path.GetFileNameWithoutExtension(dllFile);
// string dllExt = Path.GetExtension(dllFile);
// string dllCopy = Path.Combine(Application.persistentDataPath, $"{dllName}{GetInstanceID()}{dllExt}");
// File.Copy(dllFile, dllCopy, true);
// dllFile = dllCopy;
libraryHandle = SystemLibrary.LoadLibrary(dllFile);
if (libraryHandle == IntPtr.Zero)
{
throw new DllNotFoundException($"Failed to load UniQuake library from path: {dllFile}, last error = {Marshal.GetLastWin32Error()}");
}
UniQuake_Init = LoadLibraryFunction<UniQuake_InitFunc>("UniQuake_Init");
UniQuake_Update = LoadLibraryFunction<UniQuake_UpdateFunc>("UniQuake_Update");
UniQuake_Shutdown = LoadLibraryFunction<UniQuake_ShutdownFunc>("UniQuake_Shutdown");
UniQuake_SetFmodSystem = LoadLibraryFunction<UniQuake_SetFmodSystemFunc>("UniQuake_SetFmodSystem");
}
private TDelegate LoadLibraryFunction<TDelegate>(string functionName)
{
IntPtr procAddress = SystemLibrary.GetProcAddress(libraryHandle, functionName);
if (procAddress == IntPtr.Zero)
{
throw new DllNotFoundException($"Could not find library function: {functionName}");
}
return Marshal.GetDelegateForFunctionPointer<TDelegate>(procAddress);
}
private void FreeLibrary()
{
if (libraryHandle != IntPtr.Zero)
{
SystemLibrary.FreeLibrary(libraryHandle);
libraryHandle = IntPtr.Zero;
}
}
}

3
Assets/Scripts/UniQuake.Interop.cs.meta
View File

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: a22391b0c55941c6b4c6fb0f8510d88e
timeCreated: 1618223248

84
Assets/Scripts/UniQuake.cs
View File

@ -1,25 +1,13 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Runtime.InteropServices;
using System.Text;
using UnityEngine;
public class UniQuake: MonoBehaviour
public partial class UniQuake: MonoBehaviour
{
#if UNITY_EDITOR
private const string DllPath = "Plugins/windows/x86_64/uniquake.dll";
#elif UNITY_STANDALONE_WIN
#if UNITY_64
private const string DllPath = "Plugins/x86_64/uniquake.dll";
#else
private const string DllPath = "Plugins/x86/uniquake.dll";
#endif
#endif
private const int DefaultMemSize = 0x8000000; // 128 MB of heap space
private const int MemSize = 0x8000000; // 128 MB of heap space
private IntPtr libraryHandle;
public int memorySize = DefaultMemSize;
private QuakeParms quakeParms;
private SystemModule systemModule;
@ -36,7 +24,8 @@ public class UniQuake: MonoBehaviour
/// </summary>
public double CurrentTime => Time.timeAsDouble - startTime;
private Action<string> logHandler;
private Action<string> logHandler;
private StringBuilder logBuffer = new StringBuilder();
void Start()
{
@ -83,7 +72,7 @@ public class UniQuake: MonoBehaviour
errState = 0,
};
quakeParms.SetArguments(arguments.ToArray());
quakeParms.AllocateMemory(MemSize);
quakeParms.AllocateMemory(memorySize);
startTime = Time.timeAsDouble;
@ -169,8 +158,6 @@ public class UniQuake: MonoBehaviour
Debug.Log(log);
}
private StringBuilder logBuffer = new StringBuilder();
private void CollectLog(string log)
{
logBuffer.Append(log);
@ -184,65 +171,6 @@ public class UniQuake: MonoBehaviour
logBuffer.Clear();
}
}
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
private delegate void UniQuake_InitFunc(IntPtr parms, IntPtr sysCalls, IntPtr glCalls);
private UniQuake_InitFunc UniQuake_Init;
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
private delegate void UniQuake_UpdateFunc(float deltaTime);
private UniQuake_UpdateFunc UniQuake_Update;
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
private delegate void UniQuake_ShutdownFunc();
private UniQuake_ShutdownFunc UniQuake_Shutdown;
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
private delegate void UniQuake_SetFmodSystemFunc(IntPtr fmodSystem);
private UniQuake_SetFmodSystemFunc UniQuake_SetFmodSystem;
private void LoadLibrary()
{
string dllFile = Path.Combine(Application.dataPath, DllPath);
// Experimental code to allow running multiple instances of Quake next to each other
// string dllName = Path.GetFileNameWithoutExtension(dllFile);
// string dllExt = Path.GetExtension(dllFile);
// string dllCopy = Path.Combine(Application.persistentDataPath, $"{dllName}{GetInstanceID()}{dllExt}");
// File.Copy(dllFile, dllCopy, true);
// dllFile = dllCopy;
libraryHandle = SystemLibrary.LoadLibrary(dllFile);
if (libraryHandle == IntPtr.Zero)
{
throw new DllNotFoundException($"Failed to load UniQuake library from path: {dllFile}, last error = {Marshal.GetLastWin32Error()}");
}
UniQuake_Init = LoadLibraryFunction<UniQuake_InitFunc>("UniQuake_Init");
UniQuake_Update = LoadLibraryFunction<UniQuake_UpdateFunc>("UniQuake_Update");
UniQuake_Shutdown = LoadLibraryFunction<UniQuake_ShutdownFunc>("UniQuake_Shutdown");
UniQuake_SetFmodSystem = LoadLibraryFunction<UniQuake_SetFmodSystemFunc>("UniQuake_SetFmodSystem");
}
private TDelegate LoadLibraryFunction<TDelegate>(string functionName)
{
IntPtr procAddress = SystemLibrary.GetProcAddress(libraryHandle, functionName);
if (procAddress == IntPtr.Zero)
{
throw new DllNotFoundException($"Could not find library function: {functionName}");
}
return Marshal.GetDelegateForFunctionPointer<TDelegate>(procAddress);
}
private void FreeLibrary()
{
if (libraryHandle != IntPtr.Zero)
{
SystemLibrary.FreeLibrary(libraryHandle);
libraryHandle = IntPtr.Zero;
}
}
}
public enum MissionPack

Write Preview
Loading…
Cancel
Save