Browse Source

Some renaming and reorganization

console
Nico de Poel 5 years ago
parent
commit
3b4382954a
  1. 8
      Assets/Scripts/Data.meta
  2. 0
      Assets/Scripts/Data/QExtensions.cs
  3. 0
      Assets/Scripts/Data/QExtensions.cs.meta
  4. 0
      Assets/Scripts/Data/QMath.cs
  5. 0
      Assets/Scripts/Data/QMath.cs.meta
  6. 0
      Assets/Scripts/Data/QModel.cs
  7. 0
      Assets/Scripts/Data/QModel.cs.meta
  8. 8
      Assets/Scripts/Modules.meta
  9. 4
      Assets/Scripts/Modules/RenderModule.cs
  10. 0
      Assets/Scripts/Modules/RenderModule.cs.meta
  11. 4
      Assets/Scripts/Modules/SystemModule.cs
  12. 0
      Assets/Scripts/Modules/SystemModule.cs.meta
  13. 14
      Assets/Scripts/UniQuake.cs

8
Assets/Scripts/Data.meta

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 7749ced6f96975544a978f030980338c
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

0
Assets/Scripts/DataDefs/QExtensions.cs → Assets/Scripts/Data/QExtensions.cs

0
Assets/Scripts/DataDefs/QExtensions.cs.meta → Assets/Scripts/Data/QExtensions.cs.meta

0
Assets/Scripts/DataDefs/QMath.cs → Assets/Scripts/Data/QMath.cs

0
Assets/Scripts/DataDefs/QMath.cs.meta → Assets/Scripts/Data/QMath.cs.meta

0
Assets/Scripts/DataDefs/QModel.cs → Assets/Scripts/Data/QModel.cs

0
Assets/Scripts/DataDefs/QModel.cs.meta → Assets/Scripts/Data/QModel.cs.meta

8
Assets/Scripts/Modules.meta

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 02f3a94369dd41d2852b32d5f9ed29f4
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

4
Assets/Scripts/ModCalls.cs → Assets/Scripts/Modules/RenderModule.cs

@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
using AOT;
using UnityEngine;
public class ModCalls : CallbackHandler<ModCalls>
public class RenderModule : CallbackHandler<RenderModule>
{
private readonly UniQuake uq;
public ModCalls(UniQuake uniQuake)
public RenderModule(UniQuake uniQuake)
{
uq = uniQuake;

0
Assets/Scripts/ModCalls.cs.meta → Assets/Scripts/Modules/RenderModule.cs.meta

4
Assets/Scripts/SysCalls.cs → Assets/Scripts/Modules/SystemModule.cs

@ -4,7 +4,7 @@ using System.Runtime.InteropServices;
using AOT;
using UnityEngine;
public class SysCalls: CallbackHandler<SysCalls>
public class SystemModule: CallbackHandler<SystemModule>
{
private const int MaxFileHandles = 50;
@ -12,7 +12,7 @@ public class SysCalls: CallbackHandler<SysCalls>
private readonly FileStream[] fileHandles = new FileStream[MaxFileHandles];
public SysCalls(UniQuake uniQuake)
public SystemModule(UniQuake uniQuake)
{
uq = uniQuake;

0
Assets/Scripts/SysCalls.cs.meta → Assets/Scripts/Modules/SystemModule.cs.meta

14
Assets/Scripts/UniQuake.cs

@ -20,8 +20,8 @@ public class UniQuake: MonoBehaviour
private IntPtr libraryHandle;
private QuakeParms quakeParms;
private SysCalls sysCalls;
private ModCalls modCalls;
private SystemModule systemModule;
private RenderModule renderModule;
private bool initialized = false;
private double startTime;
@ -33,8 +33,8 @@ public class UniQuake: MonoBehaviour
void Start()
{
sysCalls = new SysCalls(this);
modCalls = new ModCalls(this);
systemModule = new SystemModule(this);
renderModule = new RenderModule(this);
LoadLibrary();
@ -59,7 +59,7 @@ public class UniQuake: MonoBehaviour
try
{
UniQuake_Init(quakeParms, sysCalls.ToIntPtr, modCalls.ToIntPtr);
UniQuake_Init(quakeParms, systemModule.ToIntPtr, renderModule.ToIntPtr);
initialized = true;
}
catch (QuakeException ex)
@ -112,8 +112,8 @@ public class UniQuake: MonoBehaviour
private void OnDestroy()
{
modCalls.Destroy();
sysCalls.Destroy();
renderModule.Destroy();
systemModule.Destroy();
if (quakeParms != null)
{

Loading…
Cancel
Save