diff --git a/Assets/Scripts/CultCache/Editor/DatabaseInspector.cs b/Assets/Scripts/CultCache/Editor/DatabaseInspector.cs index 0ea16b439..491260ce6 100644 --- a/Assets/Scripts/CultCache/Editor/DatabaseInspector.cs +++ b/Assets/Scripts/CultCache/Editor/DatabaseInspector.cs @@ -9,12 +9,12 @@ using System.Linq; using System.Reflection; using MessagePack; using Newtonsoft.Json; -using Unity.Mathematics; +using CultMath; using UnityEditor; using UnityEngine; -using static Unity.Mathematics.math; +using static CultMath.math; using static UnityEditor.EditorGUILayout; -using int2 = Unity.Mathematics.int2; +using int2 = CultMath.int2; using Object = UnityEngine.Object; public class DatabaseInspector : EditorWindow diff --git a/Assets/Scripts/CultCache/Editor/Inspectors/AetheriaInspectors.cs b/Assets/Scripts/CultCache/Editor/Inspectors/AetheriaInspectors.cs index d60574934..6564ce720 100644 --- a/Assets/Scripts/CultCache/Editor/Inspectors/AetheriaInspectors.cs +++ b/Assets/Scripts/CultCache/Editor/Inspectors/AetheriaInspectors.cs @@ -2,11 +2,11 @@ using System; using System.Collections; using System.Collections.Generic; using System.Linq; -using Unity.Mathematics; +using CultMath; using UnityEditor; using UnityEngine; using static UnityEditor.EditorGUILayout; -using static Unity.Mathematics.math; +using static CultMath.math; public class StatReferenceInspector : BaseInspector { diff --git a/Assets/Scripts/CultCache/Editor/Inspectors/AnimationCurveInspector.cs b/Assets/Scripts/CultCache/Editor/Inspectors/AnimationCurveInspector.cs index 6f586824b..af75441dd 100644 --- a/Assets/Scripts/CultCache/Editor/Inspectors/AnimationCurveInspector.cs +++ b/Assets/Scripts/CultCache/Editor/Inspectors/AnimationCurveInspector.cs @@ -1,9 +1,9 @@ using System.Linq; -using Unity.Mathematics; +using CultMath; using UnityEditor; using UnityEngine; using static UnityEditor.EditorGUILayout; -using static Unity.Mathematics.math; +using static CultMath.math; public class AnimationCurveFloat4Inspector : BaseInspector { diff --git a/Assets/Scripts/CultCache/Editor/Inspectors/EnumValuesInspector.cs b/Assets/Scripts/CultCache/Editor/Inspectors/EnumValuesInspector.cs index 4f4d48590..b12e1159c 100644 --- a/Assets/Scripts/CultCache/Editor/Inspectors/EnumValuesInspector.cs +++ b/Assets/Scripts/CultCache/Editor/Inspectors/EnumValuesInspector.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using UnityEditor; using UnityEngine; -using static Unity.Mathematics.math; +using static CultMath.math; using static UnityEditor.EditorGUILayout; public class EnumInspector : BaseInspector, InspectableEnumValuesAttribute> diff --git a/Assets/Scripts/CultCache/Editor/Inspectors/IntInspector.cs b/Assets/Scripts/CultCache/Editor/Inspectors/IntInspector.cs index 51e990342..d153699dc 100644 --- a/Assets/Scripts/CultCache/Editor/Inspectors/IntInspector.cs +++ b/Assets/Scripts/CultCache/Editor/Inspectors/IntInspector.cs @@ -1,4 +1,4 @@ -using static Unity.Mathematics.math; +using static CultMath.math; using UnityEditor; using UnityEngine; using static UnityEditor.EditorGUILayout; diff --git a/Assets/Scripts/CultCache/Editor/Inspectors/MathematicsInspector.cs b/Assets/Scripts/CultCache/Editor/Inspectors/MathematicsInspector.cs index 6232f6e99..4bf875220 100644 --- a/Assets/Scripts/CultCache/Editor/Inspectors/MathematicsInspector.cs +++ b/Assets/Scripts/CultCache/Editor/Inspectors/MathematicsInspector.cs @@ -1,4 +1,4 @@ -using Unity.Mathematics; +using CultMath; using UnityEditor; using UnityEngine; using static UnityEditor.EditorGUILayout; diff --git a/Assets/Scripts/CultCache/UnityExtensions.cs b/Assets/Scripts/CultCache/UnityExtensions.cs index aaebc4106..4830ae990 100644 --- a/Assets/Scripts/CultCache/UnityExtensions.cs +++ b/Assets/Scripts/CultCache/UnityExtensions.cs @@ -1,7 +1,7 @@ using System.Linq; -using Unity.Mathematics; +using CultMath; using UnityEngine; -using static Unity.Mathematics.math; +using static CultMath.math; public static class UnityExtensions { @@ -47,7 +47,4 @@ public static class UnityExtensions public static Color ToColor(this float3 v) => new Color(v.x,v.y,v.z); public static float3 ToFloat3(this Color c) => float3(c.r,c.g,c.b); - - public static Color ToColor(this float4 v) => new Color(v.x,v.y,v.z, v.w); - public static float4 ToFloat4(this Color c) => float4(c.r, c.g, c.b, c.a); } \ No newline at end of file diff --git a/Assets/Scripts/Editor/NameTools.cs b/Assets/Scripts/Editor/NameTools.cs index 1482e4022..d62be51b2 100644 --- a/Assets/Scripts/Editor/NameTools.cs +++ b/Assets/Scripts/Editor/NameTools.cs @@ -4,10 +4,10 @@ using System.IO; using System.Linq; using System.Text.RegularExpressions; using MessagePack; -using Unity.Mathematics; +using CultMath; using UnityEngine; using UnityEditor; -using Random = Unity.Mathematics.Random; +using Random = CultMath.Random; public class NameTools : EditorWindow { diff --git a/Assets/Scripts/Gameplay/ActionGameManager.cs b/Assets/Scripts/Gameplay/ActionGameManager.cs index cffa5ab59..5d1000cc2 100644 --- a/Assets/Scripts/Gameplay/ActionGameManager.cs +++ b/Assets/Scripts/Gameplay/ActionGameManager.cs @@ -19,13 +19,13 @@ using UnityEngine.InputSystem; using UnityEngine.Rendering.PostProcessing; using UnityEngine.Serialization; using UnityEngine.UI; -using Unity.Mathematics; +using CultMath; using UnityEngine.EventSystems; -using static Unity.Mathematics.math; -using float2 = Unity.Mathematics.float2; -using float3 = Unity.Mathematics.float3; +using static CultMath.math; +using float2 = CultMath.float2; +using float3 = CultMath.float3; using Path = System.IO.Path; -using quaternion = Unity.Mathematics.quaternion; +using quaternion = CultMath.quaternion; using Random = UnityEngine.Random; public class ActionGameManager : MonoBehaviour @@ -1167,7 +1167,7 @@ public class ActionGameManager : MonoBehaviour } var look = Input.Player.Look.ReadValue(); _entityYawPitch = float2(_entityYawPitch.x + look.x * Sensitivity.x, clamp(_entityYawPitch.y + look.y * Sensitivity.y, -.45f * PI, .45f * PI)); - _viewDirection = mul(float3(0, 0, 1), Unity.Mathematics.float3x3.Euler(float3(_entityYawPitch.yx, 0), RotationOrder.YXZ)); + _viewDirection = mul(float3(0, 0, 1), CultMath.float3x3.Euler(float3(_entityYawPitch.yx, 0), RotationOrder.YXZ)); CurrentEntity.LookDirection = _viewDirection; HeatstrokePost.weight = saturate(unlerp(0, Settings.GameplaySettings.SevereHeatstrokeRiskThreshold, CurrentEntity.Heatstroke)); var severeHeatstrokeLerp = saturate(unlerp(Settings.GameplaySettings.SevereHeatstrokeRiskThreshold, 1, CurrentEntity.Heatstroke)); diff --git a/Assets/Scripts/Gameplay/ArticulationPoint.cs b/Assets/Scripts/Gameplay/ArticulationPoint.cs index ba9b43c07..427b74c0f 100644 --- a/Assets/Scripts/Gameplay/ArticulationPoint.cs +++ b/Assets/Scripts/Gameplay/ArticulationPoint.cs @@ -1,8 +1,8 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; public class ArticulationPoint : MonoBehaviour { diff --git a/Assets/Scripts/Gameplay/EntityInstance.cs b/Assets/Scripts/Gameplay/EntityInstance.cs index f68ccc726..3c18a1469 100644 --- a/Assets/Scripts/Gameplay/EntityInstance.cs +++ b/Assets/Scripts/Gameplay/EntityInstance.cs @@ -4,9 +4,9 @@ using System.Collections.Generic; using System.Linq; using UniRx; using UnityEngine; -using Unity.Mathematics; -using static Unity.Mathematics.math; -using float2 = Unity.Mathematics.float2; +using CultMath; +using static CultMath.math; +using float2 = CultMath.float2; using Random = UnityEngine.Random; public class EntityInstance : MonoBehaviour diff --git a/Assets/Scripts/Gameplay/FieldDriver.cs b/Assets/Scripts/Gameplay/FieldDriver.cs index bca30c68f..a7d9e00fb 100644 --- a/Assets/Scripts/Gameplay/FieldDriver.cs +++ b/Assets/Scripts/Gameplay/FieldDriver.cs @@ -3,8 +3,8 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.InputSystem; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; public class FieldDriver : MonoBehaviour { diff --git a/Assets/Scripts/Gameplay/GridObject.cs b/Assets/Scripts/Gameplay/GridObject.cs index 772ed781c..b782a431a 100644 --- a/Assets/Scripts/Gameplay/GridObject.cs +++ b/Assets/Scripts/Gameplay/GridObject.cs @@ -1,7 +1,7 @@ using System; -using Unity.Mathematics; +using CultMath; using UnityEngine; -using static Unity.Mathematics.math; +using static CultMath.math; using Random = UnityEngine.Random; public class GridObject : MonoBehaviour diff --git a/Assets/Scripts/Gameplay/HullCollider.cs b/Assets/Scripts/Gameplay/HullCollider.cs index cf5ee155e..e09ccec14 100644 --- a/Assets/Scripts/Gameplay/HullCollider.cs +++ b/Assets/Scripts/Gameplay/HullCollider.cs @@ -2,10 +2,10 @@ using System.Collections; using System.Collections.Generic; using UniRx; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; using UnityEngine; -using float2 = Unity.Mathematics.float2; +using float2 = CultMath.float2; public class HullCollider : MonoBehaviour { diff --git a/Assets/Scripts/Gameplay/ItemPickup.cs b/Assets/Scripts/Gameplay/ItemPickup.cs index 81436f564..b863fd844 100644 --- a/Assets/Scripts/Gameplay/ItemPickup.cs +++ b/Assets/Scripts/Gameplay/ItemPickup.cs @@ -1,8 +1,8 @@ using System; using TMPro; -using Unity.Mathematics; +using CultMath; using UnityEngine; -using static Unity.Mathematics.math; +using static CultMath.math; public class ItemPickup : MonoBehaviour { diff --git a/Assets/Scripts/Gameplay/ShieldManager.cs b/Assets/Scripts/Gameplay/ShieldManager.cs index fc24c8b12..eeced598f 100644 --- a/Assets/Scripts/Gameplay/ShieldManager.cs +++ b/Assets/Scripts/Gameplay/ShieldManager.cs @@ -2,8 +2,8 @@ using System; using System.Collections; using System.Collections.Generic; using System.Linq; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; using UnityEngine; public class ShieldManager : MonoBehaviour diff --git a/Assets/Scripts/Gameplay/ShieldTest.cs b/Assets/Scripts/Gameplay/ShieldTest.cs index aee32990e..6466fa604 100644 --- a/Assets/Scripts/Gameplay/ShieldTest.cs +++ b/Assets/Scripts/Gameplay/ShieldTest.cs @@ -1,8 +1,8 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; public class ShieldTest : MonoBehaviour { diff --git a/Assets/Scripts/Gameplay/ShipInstance.cs b/Assets/Scripts/Gameplay/ShipInstance.cs index 5d0f57e3b..eacf42758 100644 --- a/Assets/Scripts/Gameplay/ShipInstance.cs +++ b/Assets/Scripts/Gameplay/ShipInstance.cs @@ -2,8 +2,8 @@ using System; using System.Collections; using System.Linq; using UnityEngine; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; public class ShipInstance : EntityInstance { diff --git a/Assets/Scripts/Gameplay/Weapons/ConstantLaser.cs b/Assets/Scripts/Gameplay/Weapons/ConstantLaser.cs index eb7f14d52..aded241fb 100644 --- a/Assets/Scripts/Gameplay/Weapons/ConstantLaser.cs +++ b/Assets/Scripts/Gameplay/Weapons/ConstantLaser.cs @@ -1,7 +1,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -using static Unity.Mathematics.math; +using static CultMath.math; public class ConstantLaser : MonoBehaviour { diff --git a/Assets/Scripts/Gameplay/Weapons/ConstantLightning.cs b/Assets/Scripts/Gameplay/Weapons/ConstantLightning.cs index d50717a22..3088c32b7 100644 --- a/Assets/Scripts/Gameplay/Weapons/ConstantLightning.cs +++ b/Assets/Scripts/Gameplay/Weapons/ConstantLightning.cs @@ -1,7 +1,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -using static Unity.Mathematics.math; +using static CultMath.math; public class ConstantLightning : MonoBehaviour { diff --git a/Assets/Scripts/Gameplay/Weapons/GuidedProjectile.cs b/Assets/Scripts/Gameplay/Weapons/GuidedProjectile.cs index e5a90a61a..c63fdd28a 100644 --- a/Assets/Scripts/Gameplay/Weapons/GuidedProjectile.cs +++ b/Assets/Scripts/Gameplay/Weapons/GuidedProjectile.cs @@ -2,12 +2,11 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -using Unity.Mathematics; -using static Unity.Mathematics.math; -using static Unity.Mathematics.noise; +using CultMath; +using static CultMath.math; using Random = UnityEngine.Random; using static Noise1D; -using float3 = Unity.Mathematics.float3; +using float3 = CultMath.float3; public class GuidedProjectile : MonoBehaviour { diff --git a/Assets/Scripts/Gameplay/Weapons/GuidedProjectileManager.cs b/Assets/Scripts/Gameplay/Weapons/GuidedProjectileManager.cs index 14b18b1f9..df9879375 100644 --- a/Assets/Scripts/Gameplay/Weapons/GuidedProjectileManager.cs +++ b/Assets/Scripts/Gameplay/Weapons/GuidedProjectileManager.cs @@ -2,9 +2,9 @@ using System.Collections; using System.Collections.Generic; using UniRx; -using Unity.Mathematics; +using CultMath; using UnityEngine; -using static Unity.Mathematics.math; +using static CultMath.math; public class GuidedProjectileManager : InstantWeaponEffectManager { diff --git a/Assets/Scripts/Gameplay/Weapons/HitscanEffect.cs b/Assets/Scripts/Gameplay/Weapons/HitscanEffect.cs index df94961bb..49201cfe0 100644 --- a/Assets/Scripts/Gameplay/Weapons/HitscanEffect.cs +++ b/Assets/Scripts/Gameplay/Weapons/HitscanEffect.cs @@ -1,7 +1,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -using static Unity.Mathematics.math; +using static CultMath.math; public class HitscanEffect : MonoBehaviour { diff --git a/Assets/Scripts/Gameplay/Weapons/Laser.cs b/Assets/Scripts/Gameplay/Weapons/Laser.cs index 2074e3a75..a111de91d 100644 --- a/Assets/Scripts/Gameplay/Weapons/Laser.cs +++ b/Assets/Scripts/Gameplay/Weapons/Laser.cs @@ -2,7 +2,7 @@ using System; using System.Collections; using System.Collections.Generic; using UnityEngine; -using static Unity.Mathematics.math; +using static CultMath.math; public class Laser : MonoBehaviour { diff --git a/Assets/Scripts/Gameplay/Weapons/Lightning.cs b/Assets/Scripts/Gameplay/Weapons/Lightning.cs index 5432761f3..da2a4cb7e 100644 --- a/Assets/Scripts/Gameplay/Weapons/Lightning.cs +++ b/Assets/Scripts/Gameplay/Weapons/Lightning.cs @@ -2,11 +2,10 @@ using System; using System.Collections; using System.Collections.Generic; using UnityEngine; -using Unity.Mathematics; -using static Unity.Mathematics.math; -using static Unity.Mathematics.noise; +using CultMath; +using static CultMath.math; using Random = UnityEngine.Random; -using static Unity.Mathematics.math; +using static CultMath.math; public class Lightning : MonoBehaviour { diff --git a/Assets/Scripts/Gameplay/Weapons/Mine.cs b/Assets/Scripts/Gameplay/Weapons/Mine.cs index 0d9c2a48c..7c0699d75 100644 --- a/Assets/Scripts/Gameplay/Weapons/Mine.cs +++ b/Assets/Scripts/Gameplay/Weapons/Mine.cs @@ -1,8 +1,8 @@ using System; using System.Collections; using System.Collections.Generic; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; using UnityEngine; using Random = UnityEngine.Random; diff --git a/Assets/Scripts/Gameplay/Weapons/MineManager.cs b/Assets/Scripts/Gameplay/Weapons/MineManager.cs index 3a9b671e3..b316b6cff 100644 --- a/Assets/Scripts/Gameplay/Weapons/MineManager.cs +++ b/Assets/Scripts/Gameplay/Weapons/MineManager.cs @@ -1,8 +1,8 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; using Random = UnityEngine.Random; public class MineManager : InstantWeaponEffectManager diff --git a/Assets/Scripts/Gameplay/Weapons/Projectile.cs b/Assets/Scripts/Gameplay/Weapons/Projectile.cs index 31d6d61c1..f93e2eb82 100644 --- a/Assets/Scripts/Gameplay/Weapons/Projectile.cs +++ b/Assets/Scripts/Gameplay/Weapons/Projectile.cs @@ -1,8 +1,8 @@ using System; using System.Collections; using System.Collections.Generic; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; using UnityEngine; using Random = UnityEngine.Random; diff --git a/Assets/Scripts/Gameplay/Weapons/ProjectileManager.cs b/Assets/Scripts/Gameplay/Weapons/ProjectileManager.cs index f60db5e5e..a081f8c23 100644 --- a/Assets/Scripts/Gameplay/Weapons/ProjectileManager.cs +++ b/Assets/Scripts/Gameplay/Weapons/ProjectileManager.cs @@ -1,8 +1,8 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; using Random = UnityEngine.Random; public class ProjectileManager : InstantWeaponEffectManager diff --git a/Assets/Scripts/ServerShared/AetheriaMath.cs b/Assets/Scripts/ServerShared/AetheriaMath.cs index 13a19a90d..1231eed58 100644 --- a/Assets/Scripts/ServerShared/AetheriaMath.cs +++ b/Assets/Scripts/ServerShared/AetheriaMath.cs @@ -1,7 +1,7 @@ using System.Collections; using System.Collections.Generic; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; public static class AetheriaMath { diff --git a/Assets/Scripts/ServerShared/Agents/Agent.cs b/Assets/Scripts/ServerShared/Agents/Agent.cs index 051ff28e7..e9710b464 100644 --- a/Assets/Scripts/ServerShared/Agents/Agent.cs +++ b/Assets/Scripts/ServerShared/Agents/Agent.cs @@ -7,9 +7,9 @@ using System.Collections; using System.Collections.Generic; using System.Linq; using UniRx; -using Unity.Mathematics; -using static Unity.Mathematics.math; -using float2 = Unity.Mathematics.float2; +using CultMath; +using static CultMath.math; +using float2 = CultMath.float2; public class Agent { diff --git a/Assets/Scripts/ServerShared/Agents/States/Combat.cs b/Assets/Scripts/ServerShared/Agents/States/Combat.cs index a8a06da2e..be7036f78 100644 --- a/Assets/Scripts/ServerShared/Agents/States/Combat.cs +++ b/Assets/Scripts/ServerShared/Agents/States/Combat.cs @@ -2,10 +2,10 @@ using System; using System.Collections.Generic; using System.Linq; using UniRx; -using static Unity.Mathematics.math; -using float2 = Unity.Mathematics.float2; -using float3 = Unity.Mathematics.float3; -using float2x2 = Unity.Mathematics.float2x2; +using static CultMath.math; +using float2 = CultMath.float2; +using float3 = CultMath.float3; +using float2x2 = CultMath.float2x2; public class CombatState : BaseState { diff --git a/Assets/Scripts/ServerShared/Agents/States/MoveTo.cs b/Assets/Scripts/ServerShared/Agents/States/MoveTo.cs index 668d79fd8..5aa1925fd 100644 --- a/Assets/Scripts/ServerShared/Agents/States/MoveTo.cs +++ b/Assets/Scripts/ServerShared/Agents/States/MoveTo.cs @@ -1,8 +1,8 @@ using System; -using Unity.Mathematics; -using static Unity.Mathematics.math; -using float2 = Unity.Mathematics.float2; +using CultMath; +using static CultMath.math; +using float2 = CultMath.float2; public abstract class MoveToState : BaseState { diff --git a/Assets/Scripts/ServerShared/Behaviors/AetherDrive.cs b/Assets/Scripts/ServerShared/Behaviors/AetherDrive.cs index 8e10ef28f..a86aed6bb 100644 --- a/Assets/Scripts/ServerShared/Behaviors/AetherDrive.cs +++ b/Assets/Scripts/ServerShared/Behaviors/AetherDrive.cs @@ -4,8 +4,8 @@ using MessagePack; using Newtonsoft.Json; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; [Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn), EntityTypeRestriction(HullType.Ship), RuntimeInspectable] public class AetherDriveData : BehaviorData @@ -114,7 +114,7 @@ public class AetherDrive : Behavior Entity.Velocity += ThrustDirection; Entity.Direction = mul(Entity.Direction, - Unity.Mathematics.float2x2.Rotate(force.z * _axis.z * ItemManager.GameplaySettings.AetherTorqueMultiplier / Entity.Mass)); + CultMath.float2x2.Rotate(force.z * _axis.z * ItemManager.GameplaySettings.AetherTorqueMultiplier / Entity.Mass)); if(float.IsNaN(Entity.Velocity.x)) ItemManager.Log("FUCK FUCK FUCK FUCK"); diff --git a/Assets/Scripts/ServerShared/Behaviors/AutoWeapon.cs b/Assets/Scripts/ServerShared/Behaviors/AutoWeapon.cs index 0d97804ef..814b2875d 100644 --- a/Assets/Scripts/ServerShared/Behaviors/AutoWeapon.cs +++ b/Assets/Scripts/ServerShared/Behaviors/AutoWeapon.cs @@ -3,8 +3,8 @@ using System.Collections; using System.Collections.Generic; using MessagePack; using Newtonsoft.Json; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; [Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn), RuntimeInspectable] public class AutoWeaponData : InstantWeaponData diff --git a/Assets/Scripts/ServerShared/Behaviors/Behaviors.cs b/Assets/Scripts/ServerShared/Behaviors/Behaviors.cs index 3a59401eb..6fe54a95b 100644 --- a/Assets/Scripts/ServerShared/Behaviors/Behaviors.cs +++ b/Assets/Scripts/ServerShared/Behaviors/Behaviors.cs @@ -9,9 +9,8 @@ using System.Linq; using JsonKnownTypes; using MessagePack; using Newtonsoft.Json; -using Unity.Mathematics; -using static Unity.Mathematics.math; -using static Unity.Mathematics.noise; +using CultMath; +using static CultMath.math; public abstract class Behavior { diff --git a/Assets/Scripts/ServerShared/Behaviors/Capacitor.cs b/Assets/Scripts/ServerShared/Behaviors/Capacitor.cs index f25c489b6..d05b7725b 100644 --- a/Assets/Scripts/ServerShared/Behaviors/Capacitor.cs +++ b/Assets/Scripts/ServerShared/Behaviors/Capacitor.cs @@ -5,8 +5,8 @@ using System.Collections.Generic; using MessagePack; using Newtonsoft.Json; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; [Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn), RuntimeInspectable] public class CapacitorData : BehaviorData diff --git a/Assets/Scripts/ServerShared/Behaviors/ChargedWeapon.cs b/Assets/Scripts/ServerShared/Behaviors/ChargedWeapon.cs index 50e23a735..7f80ab9d0 100644 --- a/Assets/Scripts/ServerShared/Behaviors/ChargedWeapon.cs +++ b/Assets/Scripts/ServerShared/Behaviors/ChargedWeapon.cs @@ -3,8 +3,8 @@ using System.Collections; using System.Collections.Generic; using MessagePack; using Newtonsoft.Json; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; [Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn), RuntimeInspectable] public class ChargedWeaponData : InstantWeaponData diff --git a/Assets/Scripts/ServerShared/Behaviors/Cockpit.cs b/Assets/Scripts/ServerShared/Behaviors/Cockpit.cs index a09a65905..eb4ad873b 100644 --- a/Assets/Scripts/ServerShared/Behaviors/Cockpit.cs +++ b/Assets/Scripts/ServerShared/Behaviors/Cockpit.cs @@ -5,8 +5,8 @@ using System.Collections.Generic; using MessagePack; using Newtonsoft.Json; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; [Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn), RuntimeInspectable] public class CockpitData : BehaviorData diff --git a/Assets/Scripts/ServerShared/Behaviors/ConstantWeapon.cs b/Assets/Scripts/ServerShared/Behaviors/ConstantWeapon.cs index e7f9a98b2..2b2a1bbaa 100644 --- a/Assets/Scripts/ServerShared/Behaviors/ConstantWeapon.cs +++ b/Assets/Scripts/ServerShared/Behaviors/ConstantWeapon.cs @@ -5,8 +5,8 @@ using System; using MessagePack; using Newtonsoft.Json; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; [Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn)] public class ConstantWeaponData : WeaponData diff --git a/Assets/Scripts/ServerShared/Behaviors/Cooldown.cs b/Assets/Scripts/ServerShared/Behaviors/Cooldown.cs index b397dd50e..4d046db1d 100644 --- a/Assets/Scripts/ServerShared/Behaviors/Cooldown.cs +++ b/Assets/Scripts/ServerShared/Behaviors/Cooldown.cs @@ -6,8 +6,8 @@ using System; using System.Linq; using MessagePack; using Newtonsoft.Json; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; [Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn), Order(-10), RuntimeInspectable] public class CooldownData : BehaviorData diff --git a/Assets/Scripts/ServerShared/Behaviors/HeatStorage.cs b/Assets/Scripts/ServerShared/Behaviors/HeatStorage.cs index 02edcb121..6180d8246 100644 --- a/Assets/Scripts/ServerShared/Behaviors/HeatStorage.cs +++ b/Assets/Scripts/ServerShared/Behaviors/HeatStorage.cs @@ -5,8 +5,8 @@ using System.Collections.Generic; using MessagePack; using Newtonsoft.Json; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; [Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn), RuntimeInspectable] public class HeatStorageData : BehaviorData diff --git a/Assets/Scripts/ServerShared/Behaviors/InstantWeapon.cs b/Assets/Scripts/ServerShared/Behaviors/InstantWeapon.cs index 79e22ed54..aa59411d5 100644 --- a/Assets/Scripts/ServerShared/Behaviors/InstantWeapon.cs +++ b/Assets/Scripts/ServerShared/Behaviors/InstantWeapon.cs @@ -3,8 +3,8 @@ using System.Collections; using System.Collections.Generic; using MessagePack; using Newtonsoft.Json; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; [Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn), RuntimeInspectable] public class InstantWeaponData : WeaponData diff --git a/Assets/Scripts/ServerShared/Behaviors/Launcher.cs b/Assets/Scripts/ServerShared/Behaviors/Launcher.cs index 5e6ea44c0..e443bdf1d 100644 --- a/Assets/Scripts/ServerShared/Behaviors/Launcher.cs +++ b/Assets/Scripts/ServerShared/Behaviors/Launcher.cs @@ -4,7 +4,7 @@ using MessagePack; using Newtonsoft.Json; -using Unity.Mathematics; +using CultMath; [Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn)] public class LauncherData : LockWeaponData diff --git a/Assets/Scripts/ServerShared/Behaviors/LockWeapon.cs b/Assets/Scripts/ServerShared/Behaviors/LockWeapon.cs index dc6fd230a..c27e51af7 100644 --- a/Assets/Scripts/ServerShared/Behaviors/LockWeapon.cs +++ b/Assets/Scripts/ServerShared/Behaviors/LockWeapon.cs @@ -3,8 +3,8 @@ using System.Collections; using System.Collections.Generic; using MessagePack; using Newtonsoft.Json; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; [Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn), RuntimeInspectable] public class LockWeaponData : InstantWeaponData diff --git a/Assets/Scripts/ServerShared/Behaviors/MiningTool.cs b/Assets/Scripts/ServerShared/Behaviors/MiningTool.cs index 84c307849..d13dc765c 100644 --- a/Assets/Scripts/ServerShared/Behaviors/MiningTool.cs +++ b/Assets/Scripts/ServerShared/Behaviors/MiningTool.cs @@ -6,8 +6,8 @@ using System; using System.Linq; using MessagePack; using Newtonsoft.Json; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; [Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn), Order(10)] public class MiningToolData : BehaviorData diff --git a/Assets/Scripts/ServerShared/Behaviors/Radiator.cs b/Assets/Scripts/ServerShared/Behaviors/Radiator.cs index 1549a8d40..3f31cdbb0 100644 --- a/Assets/Scripts/ServerShared/Behaviors/Radiator.cs +++ b/Assets/Scripts/ServerShared/Behaviors/Radiator.cs @@ -4,8 +4,8 @@ using MessagePack; using Newtonsoft.Json; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; [Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn), RuntimeInspectable] public class RadiatorData : BehaviorData diff --git a/Assets/Scripts/ServerShared/Behaviors/Reactor.cs b/Assets/Scripts/ServerShared/Behaviors/Reactor.cs index a5ea6e937..4a65a337f 100644 --- a/Assets/Scripts/ServerShared/Behaviors/Reactor.cs +++ b/Assets/Scripts/ServerShared/Behaviors/Reactor.cs @@ -8,8 +8,8 @@ using System.Linq; using MessagePack; using Newtonsoft.Json; using UniRx; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; [Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn), RuntimeInspectable] public class ReactorData : BehaviorData diff --git a/Assets/Scripts/ServerShared/Behaviors/Reflector.cs b/Assets/Scripts/ServerShared/Behaviors/Reflector.cs index cb23004b0..b5c4b4ad6 100644 --- a/Assets/Scripts/ServerShared/Behaviors/Reflector.cs +++ b/Assets/Scripts/ServerShared/Behaviors/Reflector.cs @@ -4,8 +4,8 @@ using MessagePack; using Newtonsoft.Json; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; [Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn), RuntimeInspectable] public class ReflectorData : BehaviorData diff --git a/Assets/Scripts/ServerShared/Behaviors/ResourceScanner.cs b/Assets/Scripts/ServerShared/Behaviors/ResourceScanner.cs index 05bedb0ed..c7035c8ef 100644 --- a/Assets/Scripts/ServerShared/Behaviors/ResourceScanner.cs +++ b/Assets/Scripts/ServerShared/Behaviors/ResourceScanner.cs @@ -6,8 +6,8 @@ using System; using System.Linq; using MessagePack; using Newtonsoft.Json; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; [Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn), RuntimeInspectable] public class ResourceScannerData : BehaviorData diff --git a/Assets/Scripts/ServerShared/Behaviors/Sensor.cs b/Assets/Scripts/ServerShared/Behaviors/Sensor.cs index d967ea8a3..417bb453b 100644 --- a/Assets/Scripts/ServerShared/Behaviors/Sensor.cs +++ b/Assets/Scripts/ServerShared/Behaviors/Sensor.cs @@ -6,8 +6,8 @@ using System; using System.Collections.Generic; using MessagePack; using Newtonsoft.Json; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; [Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn), RuntimeInspectable] public class SensorData : BehaviorData diff --git a/Assets/Scripts/ServerShared/Behaviors/Shield.cs b/Assets/Scripts/ServerShared/Behaviors/Shield.cs index 56f8d0165..474a3f37e 100644 --- a/Assets/Scripts/ServerShared/Behaviors/Shield.cs +++ b/Assets/Scripts/ServerShared/Behaviors/Shield.cs @@ -4,8 +4,8 @@ using MessagePack; using Newtonsoft.Json; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; [Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn), RuntimeInspectable] public class ShieldData : BehaviorData diff --git a/Assets/Scripts/ServerShared/Behaviors/Thruster.cs b/Assets/Scripts/ServerShared/Behaviors/Thruster.cs index e5908a847..79dac790b 100644 --- a/Assets/Scripts/ServerShared/Behaviors/Thruster.cs +++ b/Assets/Scripts/ServerShared/Behaviors/Thruster.cs @@ -4,8 +4,8 @@ using MessagePack; using Newtonsoft.Json; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; [Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn), EntityTypeRestriction(HullType.Ship), RuntimeInspectable] public class ThrusterData : BehaviorData @@ -78,7 +78,7 @@ public class Thruster : Behavior, IAnalogBehavior Thrust = Evaluate(_data.Thrust); Entity.Velocity -= Direction.xz * _input * Thrust / Entity.Mass * dt; Entity.Direction = mul(Entity.Direction, - Unity.Mathematics.float2x2.Rotate(_input * Torque * Thrust * ItemManager.GameplaySettings.TorqueMultiplier / Entity.Mass * dt)); + CultMath.float2x2.Rotate(_input * Torque * Thrust * ItemManager.GameplaySettings.TorqueMultiplier / Entity.Mass * dt)); AddHeat(_input * Evaluate(_data.Heat) * dt); var vis = _input * Evaluate(_data.Visibility); if (!Entity.VisibilitySources.ContainsKey(this) || vis > Entity.VisibilitySources[this]) diff --git a/Assets/Scripts/ServerShared/Behaviors/TurretController.cs b/Assets/Scripts/ServerShared/Behaviors/TurretController.cs index f2d99e948..d85dc4eff 100644 --- a/Assets/Scripts/ServerShared/Behaviors/TurretController.cs +++ b/Assets/Scripts/ServerShared/Behaviors/TurretController.cs @@ -7,9 +7,9 @@ using System.Linq; using MessagePack; using Newtonsoft.Json; using UniRx; -using Unity.Mathematics; -using static Unity.Mathematics.math; -using float3 = Unity.Mathematics.float3; +using CultMath; +using static CultMath.math; +using float3 = CultMath.float3; [MessagePackObject, JsonObject(MemberSerialization.OptIn), RuntimeInspectable] public class TurretControllerData : BehaviorData diff --git a/Assets/Scripts/ServerShared/Behaviors/VelocityConversion.cs b/Assets/Scripts/ServerShared/Behaviors/VelocityConversion.cs index 35a89bfed..da728d91d 100644 --- a/Assets/Scripts/ServerShared/Behaviors/VelocityConversion.cs +++ b/Assets/Scripts/ServerShared/Behaviors/VelocityConversion.cs @@ -4,8 +4,8 @@ using MessagePack; using Newtonsoft.Json; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; [MessagePackObject, JsonObject(MemberSerialization.OptIn), RuntimeInspectable] public class VelocityConversionData : BehaviorData diff --git a/Assets/Scripts/ServerShared/Behaviors/VelocityLimit.cs b/Assets/Scripts/ServerShared/Behaviors/VelocityLimit.cs index 2b66d512b..64a312478 100644 --- a/Assets/Scripts/ServerShared/Behaviors/VelocityLimit.cs +++ b/Assets/Scripts/ServerShared/Behaviors/VelocityLimit.cs @@ -4,8 +4,8 @@ using MessagePack; using Newtonsoft.Json; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; [Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn), RuntimeInspectable] public class VelocityLimitData : BehaviorData diff --git a/Assets/Scripts/ServerShared/Behaviors/Weapon.cs b/Assets/Scripts/ServerShared/Behaviors/Weapon.cs index 5af38dd5b..73e733b5d 100644 --- a/Assets/Scripts/ServerShared/Behaviors/Weapon.cs +++ b/Assets/Scripts/ServerShared/Behaviors/Weapon.cs @@ -7,8 +7,8 @@ using System.Collections.Generic; using System.Linq; using MessagePack; using Newtonsoft.Json; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; [Inspectable, Union(0, typeof(InstantWeaponData)), diff --git a/Assets/Scripts/ServerShared/Behaviors/Wear.cs b/Assets/Scripts/ServerShared/Behaviors/Wear.cs index 945206bad..e6ea327ee 100644 --- a/Assets/Scripts/ServerShared/Behaviors/Wear.cs +++ b/Assets/Scripts/ServerShared/Behaviors/Wear.cs @@ -5,8 +5,8 @@ using System.Collections.Generic; using MessagePack; using Newtonsoft.Json; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; [Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn), Order(1000), RuntimeInspectable] public class WearData : BehaviorData diff --git a/Assets/Scripts/ServerShared/BezierCurve.cs b/Assets/Scripts/ServerShared/BezierCurve.cs index 78ac3ef22..7574de8e7 100644 --- a/Assets/Scripts/ServerShared/BezierCurve.cs +++ b/Assets/Scripts/ServerShared/BezierCurve.cs @@ -2,8 +2,8 @@ using System; using System.Linq; using MessagePack; using Newtonsoft.Json; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; [MessagePackObject, JsonObject(MemberSerialization.OptIn)] public class BezierCurve diff --git a/Assets/Scripts/ServerShared/ColorMath.cs b/Assets/Scripts/ServerShared/ColorMath.cs index d1616d5be..b94764bd3 100644 --- a/Assets/Scripts/ServerShared/ColorMath.cs +++ b/Assets/Scripts/ServerShared/ColorMath.cs @@ -4,8 +4,8 @@ using System.Collections; using System.Collections.Generic; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; // Thanks to Ian Taylor at https://www.chilliant.com/rgb2hsv.html public static class ColorMath diff --git a/Assets/Scripts/ServerShared/Corporations.cs b/Assets/Scripts/ServerShared/Corporations.cs index dcd674ca2..fea1a4be8 100644 --- a/Assets/Scripts/ServerShared/Corporations.cs +++ b/Assets/Scripts/ServerShared/Corporations.cs @@ -7,7 +7,7 @@ using System.Collections; using System.Collections.Generic; using MessagePack; using Newtonsoft.Json; -using Unity.Mathematics; +using CultMath; [DatabaseCategory("Galaxy"), Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn)] public class Faction : DatabaseEntry, INamedEntry diff --git a/Assets/Scripts/ServerShared/CultCache/DatabaseEntry.cs b/Assets/Scripts/ServerShared/CultCache/DatabaseEntry.cs index a9fad3a70..cf1463467 100644 --- a/Assets/Scripts/ServerShared/CultCache/DatabaseEntry.cs +++ b/Assets/Scripts/ServerShared/CultCache/DatabaseEntry.cs @@ -9,8 +9,8 @@ using MessagePack; using MessagePack.Formatters; using Newtonsoft.Json; // TODO: USE THIS EVERYWHERE -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; public interface INamedEntry { diff --git a/Assets/Scripts/ServerShared/CultCache/Serialization/JsonConverters.cs b/Assets/Scripts/ServerShared/CultCache/Serialization/JsonConverters.cs index c76bcad2a..6b6c1da96 100644 --- a/Assets/Scripts/ServerShared/CultCache/Serialization/JsonConverters.cs +++ b/Assets/Scripts/ServerShared/CultCache/Serialization/JsonConverters.cs @@ -3,8 +3,8 @@ using System.Collections; using System.Collections.Generic; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; public class MathJsonConverter : JsonConverter { diff --git a/Assets/Scripts/ServerShared/CultCache/Serialization/MathFormatters.cs b/Assets/Scripts/ServerShared/CultCache/Serialization/MathFormatters.cs index 5a906895b..a8f65c3ee 100644 --- a/Assets/Scripts/ServerShared/CultCache/Serialization/MathFormatters.cs +++ b/Assets/Scripts/ServerShared/CultCache/Serialization/MathFormatters.cs @@ -2,8 +2,8 @@ using System.Collections; using System.Collections.Generic; using MessagePack; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; public class Float2Formatter : MessagePack.Formatters.IMessagePackFormatter { diff --git a/Assets/Scripts/ServerShared/CultCache/Serialization/MathResolver.cs b/Assets/Scripts/ServerShared/CultCache/Serialization/MathResolver.cs index bc0574d26..1a09c35a2 100644 --- a/Assets/Scripts/ServerShared/CultCache/Serialization/MathResolver.cs +++ b/Assets/Scripts/ServerShared/CultCache/Serialization/MathResolver.cs @@ -3,8 +3,8 @@ using System.Collections; using System.Collections.Generic; using MessagePack; using MessagePack.Formatters; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; public class MathResolver : IFormatterResolver diff --git a/Assets/Scripts/ServerShared/CultCache/Serialization/RegisterResolver.cs b/Assets/Scripts/ServerShared/CultCache/Serialization/RegisterResolver.cs index 711348d21..b9292893d 100644 --- a/Assets/Scripts/ServerShared/CultCache/Serialization/RegisterResolver.cs +++ b/Assets/Scripts/ServerShared/CultCache/Serialization/RegisterResolver.cs @@ -23,7 +23,7 @@ public static class RegisterResolver var options = MessagePackSerializerOptions.Standard.WithResolver(resolver); MessagePackSerializer.DefaultOptions = options; - // Add Unity.Mathematics serialization support to Newtonsoft JSON + // Add CultMath serialization support to Newtonsoft JSON JsonConvert.DefaultSettings = () => new JsonSerializerSettings { Converters = new List diff --git a/Assets/Scripts/ServerShared/Entity.cs b/Assets/Scripts/ServerShared/Entity.cs index 281cd9d58..93a9c82a5 100644 --- a/Assets/Scripts/ServerShared/Entity.cs +++ b/Assets/Scripts/ServerShared/Entity.cs @@ -6,9 +6,9 @@ using System; using System.Collections.Generic; using System.Linq; using UniRx; -using Unity.Mathematics; -using static Unity.Mathematics.math; -using int2 = Unity.Mathematics.int2; +using CultMath; +using static CultMath.math; +using int2 = CultMath.int2; public abstract class Entity { diff --git a/Assets/Scripts/ServerShared/EntitySerializer.cs b/Assets/Scripts/ServerShared/EntitySerializer.cs index 0a4f0e77b..ea276a60a 100644 --- a/Assets/Scripts/ServerShared/EntitySerializer.cs +++ b/Assets/Scripts/ServerShared/EntitySerializer.cs @@ -3,7 +3,7 @@ using System.Collections; using System.Collections.Generic; using System.Linq; using MessagePack; -using Unity.Mathematics; +using CultMath; public static class EntitySerializer { diff --git a/Assets/Scripts/ServerShared/Environment.cs b/Assets/Scripts/ServerShared/Environment.cs index d2fcac804..2424ca214 100644 --- a/Assets/Scripts/ServerShared/Environment.cs +++ b/Assets/Scripts/ServerShared/Environment.cs @@ -1,10 +1,9 @@ using System; using MessagePack; using Newtonsoft.Json; -using Unity.Mathematics; -using static Unity.Mathematics.math; -using static Unity.Mathematics.noise; -using float2 = Unity.Mathematics.float2; +using CultMath; +using static CultMath.math; +using float2 = CultMath.float2; [Serializable, MessagePackObject, JsonObject(MemberSerialization.OptIn)] public class ZoneEnvironment diff --git a/Assets/Scripts/ServerShared/ExponentialCurve.cs b/Assets/Scripts/ServerShared/ExponentialCurve.cs index 1ac842848..e20fe0360 100644 --- a/Assets/Scripts/ServerShared/ExponentialCurve.cs +++ b/Assets/Scripts/ServerShared/ExponentialCurve.cs @@ -7,8 +7,8 @@ using System.Collections; using System.Collections.Generic; using MessagePack; using Newtonsoft.Json; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; [Serializable, MessagePackObject, JsonObject] public class ExponentialCurve diff --git a/Assets/Scripts/ServerShared/Extensions.cs b/Assets/Scripts/ServerShared/Extensions.cs index ccd1676dd..8118b1a11 100644 --- a/Assets/Scripts/ServerShared/Extensions.cs +++ b/Assets/Scripts/ServerShared/Extensions.cs @@ -7,11 +7,11 @@ using System.Numerics; using System.Reflection; using System.Text.RegularExpressions; using MessagePack; -using Unity.Mathematics; -using static Unity.Mathematics.math; -using Random = Unity.Mathematics.Random; +using CultMath; +using static CultMath.math; +using Random = CultMath.Random; using Unity.Tiny; -using float2 = Unity.Mathematics.float2; +using float2 = CultMath.float2; public static class Extensions { diff --git a/Assets/Scripts/ServerShared/Galaxy.cs b/Assets/Scripts/ServerShared/Galaxy.cs index fe2e55df3..722ac43ac 100644 --- a/Assets/Scripts/ServerShared/Galaxy.cs +++ b/Assets/Scripts/ServerShared/Galaxy.cs @@ -9,9 +9,9 @@ using Ink.Runtime; using MIConvexHull; using JM.LinqFaster; using UniRx; -using Unity.Mathematics; -using static Unity.Mathematics.math; -using Random = Unity.Mathematics.Random; +using CultMath; +using static CultMath.math; +using Random = CultMath.Random; public class Galaxy { diff --git a/Assets/Scripts/ServerShared/GlobalData.cs b/Assets/Scripts/ServerShared/GlobalData.cs index dccc5c01a..9ff30376d 100644 --- a/Assets/Scripts/ServerShared/GlobalData.cs +++ b/Assets/Scripts/ServerShared/GlobalData.cs @@ -7,9 +7,8 @@ using System.Collections; using System.Collections.Generic; using MessagePack; using Newtonsoft.Json; -using Unity.Mathematics; -using static Unity.Mathematics.math; -using static Unity.Mathematics.noise; +using CultMath; +using static CultMath.math; using static NoiseFbm; [Inspectable, Serializable, DatabaseCategory("Galaxy"), MessagePackObject, JsonObject(MemberSerialization.OptIn)] diff --git a/Assets/Scripts/ServerShared/ItemData.cs b/Assets/Scripts/ServerShared/ItemData.cs index 7b0cf4725..208b0d9e8 100644 --- a/Assets/Scripts/ServerShared/ItemData.cs +++ b/Assets/Scripts/ServerShared/ItemData.cs @@ -9,10 +9,10 @@ using System.Linq; using JsonKnownTypes; using MessagePack; using Newtonsoft.Json; -using Unity.Mathematics; -using static Unity.Mathematics.math; -using float2 = Unity.Mathematics.float2; -using int2 = Unity.Mathematics.int2; +using CultMath; +using static CultMath.math; +using float2 = CultMath.float2; +using int2 = CultMath.int2; [Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn)] public class Shape diff --git a/Assets/Scripts/ServerShared/ItemInstance.cs b/Assets/Scripts/ServerShared/ItemInstance.cs index f1871f4bf..71c2dabb7 100644 --- a/Assets/Scripts/ServerShared/ItemInstance.cs +++ b/Assets/Scripts/ServerShared/ItemInstance.cs @@ -12,8 +12,8 @@ using JsonKnownTypes; using MessagePack; using MessagePack.Formatters; using Newtonsoft.Json; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; [Union(0, typeof(SimpleCommodity)), Union(1, typeof(CompoundCommodity)), diff --git a/Assets/Scripts/ServerShared/ItemManager.cs b/Assets/Scripts/ServerShared/ItemManager.cs index 1e71f4221..be7b8a7fb 100644 --- a/Assets/Scripts/ServerShared/ItemManager.cs +++ b/Assets/Scripts/ServerShared/ItemManager.cs @@ -6,13 +6,13 @@ using System; using System.Collections; using System.Collections.Generic; using System.Linq; -using Unity.Mathematics; -using static Unity.Mathematics.math; -using float2 = Unity.Mathematics.float2; -using Random = Unity.Mathematics.Random; +using CultMath; +using static CultMath.math; +using float2 = CultMath.float2; +using Random = CultMath.Random; using JM.LinqFaster; using UniRx; -using float4 = Unity.Mathematics.float4; +using float4 = CultMath.float4; public class ItemManager { diff --git a/Assets/Scripts/ServerShared/LoadoutGenerator.cs b/Assets/Scripts/ServerShared/LoadoutGenerator.cs index 440aac6ab..473071fa0 100644 --- a/Assets/Scripts/ServerShared/LoadoutGenerator.cs +++ b/Assets/Scripts/ServerShared/LoadoutGenerator.cs @@ -2,9 +2,9 @@ using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; -using Unity.Mathematics; -using static Unity.Mathematics.math; -using Random = Unity.Mathematics.Random; +using CultMath; +using static CultMath.math; +using Random = CultMath.Random; public class LoadoutGenerator { diff --git a/Assets/Scripts/ServerShared/MarkovNameGenerator.cs b/Assets/Scripts/ServerShared/MarkovNameGenerator.cs index 5a770c7bf..cf58a7b91 100644 --- a/Assets/Scripts/ServerShared/MarkovNameGenerator.cs +++ b/Assets/Scripts/ServerShared/MarkovNameGenerator.cs @@ -5,8 +5,8 @@ using System; using System.Collections.Generic; using System.Linq; -using static Unity.Mathematics.math; -using Random = Unity.Mathematics.Random; +using static CultMath.math; +using Random = CultMath.Random; //Generates random names based on the statistical weight of letter sequences //in a collection of sample names diff --git a/Assets/Scripts/ServerShared/NIH/KDTree/KDBounds.cs b/Assets/Scripts/ServerShared/NIH/KDTree/KDBounds.cs index c02670fe2..3b3f65e7c 100644 --- a/Assets/Scripts/ServerShared/NIH/KDTree/KDBounds.cs +++ b/Assets/Scripts/ServerShared/NIH/KDTree/KDBounds.cs @@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -using Unity.Mathematics; +using CultMath; namespace DataStructures.ViliWonka.KDTree { diff --git a/Assets/Scripts/ServerShared/NIH/KDTree/KDQuery/Base.cs b/Assets/Scripts/ServerShared/NIH/KDTree/KDQuery/Base.cs index e7374b9a2..68afb0d8f 100644 --- a/Assets/Scripts/ServerShared/NIH/KDTree/KDQuery/Base.cs +++ b/Assets/Scripts/ServerShared/NIH/KDTree/KDQuery/Base.cs @@ -35,8 +35,8 @@ KDQuery can query different KDTrees. using System.Collections.Generic; using System; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; namespace DataStructures.ViliWonka.KDTree { diff --git a/Assets/Scripts/ServerShared/NIH/KDTree/KDQuery/KDQueryNode.cs b/Assets/Scripts/ServerShared/NIH/KDTree/KDQuery/KDQueryNode.cs index 3974fd5a3..88dc273d7 100644 --- a/Assets/Scripts/ServerShared/NIH/KDTree/KDQuery/KDQueryNode.cs +++ b/Assets/Scripts/ServerShared/NIH/KDTree/KDQuery/KDQueryNode.cs @@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -using Unity.Mathematics; +using CultMath; namespace DataStructures.ViliWonka.KDTree { diff --git a/Assets/Scripts/ServerShared/NIH/KDTree/KDQuery/QueryClosest.cs b/Assets/Scripts/ServerShared/NIH/KDTree/KDQuery/QueryClosest.cs index b6c437fac..7d8e982eb 100644 --- a/Assets/Scripts/ServerShared/NIH/KDTree/KDQuery/QueryClosest.cs +++ b/Assets/Scripts/ServerShared/NIH/KDTree/KDQuery/QueryClosest.cs @@ -23,8 +23,8 @@ SOFTWARE. using System.Collections.Generic; using System; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; namespace DataStructures.ViliWonka.KDTree { diff --git a/Assets/Scripts/ServerShared/NIH/KDTree/KDQuery/QueryInterval.cs b/Assets/Scripts/ServerShared/NIH/KDTree/KDQuery/QueryInterval.cs index f0a13befa..3dc77240d 100644 --- a/Assets/Scripts/ServerShared/NIH/KDTree/KDQuery/QueryInterval.cs +++ b/Assets/Scripts/ServerShared/NIH/KDTree/KDQuery/QueryInterval.cs @@ -23,8 +23,8 @@ SOFTWARE. using System.Collections.Generic; using System; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; namespace DataStructures.ViliWonka.KDTree { diff --git a/Assets/Scripts/ServerShared/NIH/KDTree/KDQuery/QueryKNearest.cs b/Assets/Scripts/ServerShared/NIH/KDTree/KDQuery/QueryKNearest.cs index 02e912957..97e4a7649 100644 --- a/Assets/Scripts/ServerShared/NIH/KDTree/KDQuery/QueryKNearest.cs +++ b/Assets/Scripts/ServerShared/NIH/KDTree/KDQuery/QueryKNearest.cs @@ -25,8 +25,8 @@ SOFTWARE. using System.Collections.Generic; using System; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; namespace DataStructures.ViliWonka.KDTree { diff --git a/Assets/Scripts/ServerShared/NIH/KDTree/KDQuery/QueryRadius.cs b/Assets/Scripts/ServerShared/NIH/KDTree/KDQuery/QueryRadius.cs index 3f66c1718..d8660c481 100644 --- a/Assets/Scripts/ServerShared/NIH/KDTree/KDQuery/QueryRadius.cs +++ b/Assets/Scripts/ServerShared/NIH/KDTree/KDQuery/QueryRadius.cs @@ -23,8 +23,8 @@ SOFTWARE. using System.Collections.Generic; using System; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; namespace DataStructures.ViliWonka.KDTree { diff --git a/Assets/Scripts/ServerShared/NIH/KDTree/KDTree.cs b/Assets/Scripts/ServerShared/NIH/KDTree/KDTree.cs index 86ad268d1..c21bd329e 100644 --- a/Assets/Scripts/ServerShared/NIH/KDTree/KDTree.cs +++ b/Assets/Scripts/ServerShared/NIH/KDTree/KDTree.cs @@ -28,9 +28,9 @@ SOFTWARE. using System.Collections; using System.Collections.Generic; using System; -using Unity.Mathematics; -using static Unity.Mathematics.math; -using float2 = Unity.Mathematics.float2; +using CultMath; +using static CultMath.math; +using float2 = CultMath.float2; namespace DataStructures.ViliWonka.KDTree { diff --git a/Assets/Scripts/ServerShared/NIH/MIConvexHull/Cell2.cs b/Assets/Scripts/ServerShared/NIH/MIConvexHull/Cell2.cs index 1907e5c2e..6e8a8d2f9 100644 --- a/Assets/Scripts/ServerShared/NIH/MIConvexHull/Cell2.cs +++ b/Assets/Scripts/ServerShared/NIH/MIConvexHull/Cell2.cs @@ -1,8 +1,8 @@ using System.Collections; using System.Linq; using MIConvexHull; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; /// /// A vertex is a simple class that stores the postion of a point, node or vertex. diff --git a/Assets/Scripts/ServerShared/NIH/MIConvexHull/Cell2Object.cs b/Assets/Scripts/ServerShared/NIH/MIConvexHull/Cell2Object.cs index 087066af1..d23fbac51 100644 --- a/Assets/Scripts/ServerShared/NIH/MIConvexHull/Cell2Object.cs +++ b/Assets/Scripts/ServerShared/NIH/MIConvexHull/Cell2Object.cs @@ -1,8 +1,8 @@ using System.Collections; using System.Linq; using MIConvexHull; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; /// /// A vertex is a simple class that stores the postion of a point, node or vertex. diff --git a/Assets/Scripts/ServerShared/NIH/MIConvexHull/ConvexHull/MathHelper.cs b/Assets/Scripts/ServerShared/NIH/MIConvexHull/ConvexHull/MathHelper.cs index 13537be7a..0f030c59d 100644 --- a/Assets/Scripts/ServerShared/NIH/MIConvexHull/ConvexHull/MathHelper.cs +++ b/Assets/Scripts/ServerShared/NIH/MIConvexHull/ConvexHull/MathHelper.cs @@ -26,9 +26,9 @@ using System; using System.Collections.Generic; -using Unity.Mathematics; -using static Unity.Mathematics.math; -using Random = Unity.Mathematics.Random; +using CultMath; +using static CultMath.math; +using Random = CultMath.Random; namespace MIConvexHull { diff --git a/Assets/Scripts/ServerShared/NIH/MIConvexHull/Vertex2.cs b/Assets/Scripts/ServerShared/NIH/MIConvexHull/Vertex2.cs index 9845884e5..e00c7deef 100644 --- a/Assets/Scripts/ServerShared/NIH/MIConvexHull/Vertex2.cs +++ b/Assets/Scripts/ServerShared/NIH/MIConvexHull/Vertex2.cs @@ -1,8 +1,8 @@ using System; using System.Collections; using MIConvexHull; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; public class Vertex2 : IVertex { diff --git a/Assets/Scripts/ServerShared/NIH/MIConvexHull/Vertex2Object.cs b/Assets/Scripts/ServerShared/NIH/MIConvexHull/Vertex2Object.cs index ae3a5cfc5..a266ddaec 100644 --- a/Assets/Scripts/ServerShared/NIH/MIConvexHull/Vertex2Object.cs +++ b/Assets/Scripts/ServerShared/NIH/MIConvexHull/Vertex2Object.cs @@ -1,4 +1,4 @@ -using Unity.Mathematics; +using CultMath; public class Vertex2 : Vertex2 { diff --git a/Assets/Scripts/ServerShared/NIH/MIConvexHull/Vertex3.cs b/Assets/Scripts/ServerShared/NIH/MIConvexHull/Vertex3.cs index fae2f56f2..a14aea5b1 100644 --- a/Assets/Scripts/ServerShared/NIH/MIConvexHull/Vertex3.cs +++ b/Assets/Scripts/ServerShared/NIH/MIConvexHull/Vertex3.cs @@ -1,7 +1,7 @@ using System.Collections; using MIConvexHull; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; public class Vertex3 : IVertex { diff --git a/Assets/Scripts/ServerShared/Narrative/StoryProcessor.cs b/Assets/Scripts/ServerShared/Narrative/StoryProcessor.cs index 794ee3ea3..e36545e38 100644 --- a/Assets/Scripts/ServerShared/Narrative/StoryProcessor.cs +++ b/Assets/Scripts/ServerShared/Narrative/StoryProcessor.cs @@ -7,7 +7,7 @@ using Ink; using Ink.Parsed; using MessagePack; using Path = System.IO.Path; -using Random = Unity.Mathematics.Random; +using Random = CultMath.Random; using Story = Ink.Runtime.Story; public class StoryProcessor : IZoneResolver, IFactionResolver diff --git a/Assets/Scripts/ServerShared/Narrative/ZoneSelectors.cs b/Assets/Scripts/ServerShared/Narrative/ZoneSelectors.cs index 0dab2bae9..ca88ea52b 100644 --- a/Assets/Scripts/ServerShared/Narrative/ZoneSelectors.cs +++ b/Assets/Scripts/ServerShared/Narrative/ZoneSelectors.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Linq; using MessagePack; -using Random = Unity.Mathematics.Random; +using Random = CultMath.Random; public abstract class ZoneSelector { diff --git a/Assets/Scripts/ServerShared/Noise1D.cs b/Assets/Scripts/ServerShared/Noise1D.cs index 15d30ab76..2b979f632 100644 --- a/Assets/Scripts/ServerShared/Noise1D.cs +++ b/Assets/Scripts/ServerShared/Noise1D.cs @@ -1,5 +1,5 @@ -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; public static class Noise1D { diff --git a/Assets/Scripts/ServerShared/OrbitalEntity.cs b/Assets/Scripts/ServerShared/OrbitalEntity.cs index d76b16b95..47121eb16 100644 --- a/Assets/Scripts/ServerShared/OrbitalEntity.cs +++ b/Assets/Scripts/ServerShared/OrbitalEntity.cs @@ -5,9 +5,9 @@ using System; using System.Collections; using System.Collections.Generic; -using Unity.Mathematics; -using static Unity.Mathematics.math; -using float2 = Unity.Mathematics.float2; +using CultMath; +using static CultMath.math; +using float2 = CultMath.float2; public class OrbitalEntity : Entity { diff --git a/Assets/Scripts/ServerShared/Rect.cs b/Assets/Scripts/ServerShared/Rect.cs index 5ace687ef..6e660a309 100644 --- a/Assets/Scripts/ServerShared/Rect.cs +++ b/Assets/Scripts/ServerShared/Rect.cs @@ -1,6 +1,6 @@ -using Unity.Mathematics; -using static Unity.Mathematics.math; -using float2 = Unity.Mathematics.float2; +using CultMath; +using static CultMath.math; +using float2 = CultMath.float2; namespace Unity.Tiny { diff --git a/Assets/Scripts/ServerShared/SampleElimination.cs b/Assets/Scripts/ServerShared/SampleElimination.cs index 0c335c13a..f708f6a88 100644 --- a/Assets/Scripts/ServerShared/SampleElimination.cs +++ b/Assets/Scripts/ServerShared/SampleElimination.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Linq; using DataStructures.ViliWonka.Heap; using DataStructures.ViliWonka.KDTree; -using Unity.Mathematics; -using static Unity.Mathematics.math; -using float2 = Unity.Mathematics.float2; -using Random = Unity.Mathematics.Random; +using CultMath; +using static CultMath.math; +using float2 = CultMath.float2; +using Random = CultMath.Random; public static class WeightedSampleElimination { diff --git a/Assets/Scripts/ServerShared/SavedGame.cs b/Assets/Scripts/ServerShared/SavedGame.cs index 4f1c26a80..2f0579fb2 100644 --- a/Assets/Scripts/ServerShared/SavedGame.cs +++ b/Assets/Scripts/ServerShared/SavedGame.cs @@ -2,8 +2,8 @@ using System; using System.Collections.Generic; using System.Linq; using MessagePack; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; [MessagePackObject] public class SavedGame diff --git a/Assets/Scripts/ServerShared/Settings.cs b/Assets/Scripts/ServerShared/Settings.cs index 8222d0127..2f4a40afc 100644 --- a/Assets/Scripts/ServerShared/Settings.cs +++ b/Assets/Scripts/ServerShared/Settings.cs @@ -7,9 +7,8 @@ using System.Collections; using System.Collections.Generic; using MessagePack; using Newtonsoft.Json; -using Unity.Mathematics; -using static Unity.Mathematics.math; -using static Unity.Mathematics.noise; +using CultMath; +using static CultMath.math; [Serializable, MessagePackObject(keyAsPropertyName:true), JsonObject] public class PlanetSettings diff --git a/Assets/Scripts/ServerShared/Ship.cs b/Assets/Scripts/ServerShared/Ship.cs index 529c07b39..9f8efbd44 100644 --- a/Assets/Scripts/ServerShared/Ship.cs +++ b/Assets/Scripts/ServerShared/Ship.cs @@ -10,9 +10,9 @@ using System.Reflection; using MessagePack; using Newtonsoft.Json; using UniRx; -using Unity.Mathematics; -using static Unity.Mathematics.math; -using quaternion = Unity.Mathematics.quaternion; +using CultMath; +using static CultMath.math; +using quaternion = CultMath.quaternion; [MessagePackObject] public class Ship : Entity diff --git a/Assets/Scripts/ServerShared/Wormhole.cs b/Assets/Scripts/ServerShared/Wormhole.cs index 447cf174c..bad43b9fd 100644 --- a/Assets/Scripts/ServerShared/Wormhole.cs +++ b/Assets/Scripts/ServerShared/Wormhole.cs @@ -1,4 +1,4 @@ -using Unity.Mathematics; +using CultMath; public class Wormhole { diff --git a/Assets/Scripts/ServerShared/Zone.cs b/Assets/Scripts/ServerShared/Zone.cs index 56305d271..e9fefd78e 100644 --- a/Assets/Scripts/ServerShared/Zone.cs +++ b/Assets/Scripts/ServerShared/Zone.cs @@ -9,10 +9,10 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; using UniRx; -using Unity.Mathematics; -using static Unity.Mathematics.math; -using float2 = Unity.Mathematics.float2; -using Random = Unity.Mathematics.Random; +using CultMath; +using static CultMath.math; +using float2 = CultMath.float2; +using Random = CultMath.Random; public class Zone { diff --git a/Assets/Scripts/ServerShared/ZoneData.cs b/Assets/Scripts/ServerShared/ZoneData.cs index d5264946e..72c623ac2 100644 --- a/Assets/Scripts/ServerShared/ZoneData.cs +++ b/Assets/Scripts/ServerShared/ZoneData.cs @@ -8,10 +8,10 @@ using System.Collections.Generic; using MessagePack; using Newtonsoft.Json; using UniRx; -using Unity.Mathematics; -using static Unity.Mathematics.math; -using float2 = Unity.Mathematics.float2; -using float3 = Unity.Mathematics.float3; +using CultMath; +using static CultMath.math; +using float2 = CultMath.float2; +using float3 = CultMath.float3; [MessagePackObject, JsonObject(MemberSerialization.OptIn)] public class ZonePack diff --git a/Assets/Scripts/ServerShared/ZoneGenerator.cs b/Assets/Scripts/ServerShared/ZoneGenerator.cs index a3408cd4c..5c2dfd208 100644 --- a/Assets/Scripts/ServerShared/ZoneGenerator.cs +++ b/Assets/Scripts/ServerShared/ZoneGenerator.cs @@ -9,10 +9,10 @@ using System.Globalization; using System.Linq; using MessagePack; using UniRx; -using Unity.Mathematics; -using static Unity.Mathematics.math; -using float2 = Unity.Mathematics.float2; -using Random = Unity.Mathematics.Random; +using CultMath; +using static CultMath.math; +using float2 = CultMath.float2; +using Random = CultMath.Random; public static class ZoneGenerator { diff --git a/Assets/Scripts/Tests/BresenhamTest.cs b/Assets/Scripts/Tests/BresenhamTest.cs index a8d9f7216..fed10a976 100644 --- a/Assets/Scripts/Tests/BresenhamTest.cs +++ b/Assets/Scripts/Tests/BresenhamTest.cs @@ -4,7 +4,7 @@ using NUnit.Framework; using System.Linq; using System.Text; using System.Threading.Tasks; -using Unity.Mathematics; +using CultMath; diff --git a/Assets/Scripts/Tests/ShapeTestScript.cs b/Assets/Scripts/Tests/ShapeTestScript.cs index 65d24e8a5..2e2a09692 100644 --- a/Assets/Scripts/Tests/ShapeTestScript.cs +++ b/Assets/Scripts/Tests/ShapeTestScript.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using NUnit.Framework; using UnityEngine; using UnityEngine.TestTools; -using Unity.Mathematics; -using static Unity.Mathematics.math; -using int2 = Unity.Mathematics.int2; +using CultMath; +using static CultMath.math; +using int2 = CultMath.int2; public class ShapeTestScript diff --git a/Assets/Scripts/UI/FieldTester.cs b/Assets/Scripts/UI/FieldTester.cs index aaefc2085..430c96384 100644 --- a/Assets/Scripts/UI/FieldTester.cs +++ b/Assets/Scripts/UI/FieldTester.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; using UnityEngine; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; using Random = UnityEngine.Random; public class FieldTester : MonoBehaviour diff --git a/Assets/Scripts/UI/HUD/PlaceUIElementWorldspace.cs b/Assets/Scripts/UI/HUD/PlaceUIElementWorldspace.cs index d4874a456..e78edf059 100644 --- a/Assets/Scripts/UI/HUD/PlaceUIElementWorldspace.cs +++ b/Assets/Scripts/UI/HUD/PlaceUIElementWorldspace.cs @@ -1,7 +1,6 @@ using UnityEngine; -using Unity.Mathematics; -using static Unity.Mathematics.math; -using static Unity.Mathematics.noise; +using CultMath; +using static CultMath.math; using static Noise1D; /// diff --git a/Assets/Scripts/UI/HUD/SchematicDisplay.cs b/Assets/Scripts/UI/HUD/SchematicDisplay.cs index b1c6329fb..1b3273dbc 100644 --- a/Assets/Scripts/UI/HUD/SchematicDisplay.cs +++ b/Assets/Scripts/UI/HUD/SchematicDisplay.cs @@ -5,9 +5,9 @@ using System.Linq; using TMPro; using UnityEngine; using UnityEngine.UI; -using Unity.Mathematics; +using CultMath; using UnityEngine.Serialization; -using static Unity.Mathematics.math; +using static CultMath.math; public class SchematicDisplay : MonoBehaviour { diff --git a/Assets/Scripts/UI/InputScreen/InputDisplayLayout.cs b/Assets/Scripts/UI/InputScreen/InputDisplayLayout.cs index 7c8b909f3..59620f91b 100644 --- a/Assets/Scripts/UI/InputScreen/InputDisplayLayout.cs +++ b/Assets/Scripts/UI/InputScreen/InputDisplayLayout.cs @@ -12,9 +12,9 @@ using UnityEngine; using UnityEngine.InputSystem; using UnityEngine.UI; using UnityEngine.UI.Extensions; -using Unity.Mathematics; +using CultMath; using UnityEngine.EventSystems; -using static Unity.Mathematics.math; +using static CultMath.math; public class InputDisplayLayout : MonoBehaviour { diff --git a/Assets/Scripts/UI/MainMenu.cs b/Assets/Scripts/UI/MainMenu.cs index 20f083b8c..fdea37ac2 100644 --- a/Assets/Scripts/UI/MainMenu.cs +++ b/Assets/Scripts/UI/MainMenu.cs @@ -9,8 +9,8 @@ using UniRx; using UnityEngine; using UnityEngine.SceneManagement; using UnityEngine.UI; -using static Unity.Mathematics.math; -using float2 = Unity.Mathematics.float2; +using static CultMath.math; +using float2 = CultMath.float2; using Random = UnityEngine.Random; public class MainMenu : MonoBehaviour diff --git a/Assets/Scripts/UI/Menu/InventoryMenu.cs b/Assets/Scripts/UI/Menu/InventoryMenu.cs index 48f2bed3f..2e41ff5e9 100644 --- a/Assets/Scripts/UI/Menu/InventoryMenu.cs +++ b/Assets/Scripts/UI/Menu/InventoryMenu.cs @@ -9,7 +9,7 @@ using System.Linq; using UnityEngine; using UniRx; using UniRx.Triggers; -using Unity.Mathematics; +using CultMath; using UnityEngine.InputSystem; using UnityEngine.UI; diff --git a/Assets/Scripts/UI/Menu/InventoryPanel.cs b/Assets/Scripts/UI/Menu/InventoryPanel.cs index dc8614cc4..cff2c2415 100644 --- a/Assets/Scripts/UI/Menu/InventoryPanel.cs +++ b/Assets/Scripts/UI/Menu/InventoryPanel.cs @@ -13,10 +13,10 @@ using UnityEngine; using UnityEngine.UI; using UnityEngine.EventSystems; using UnityEngine.Experimental.Rendering; -using Unity.Mathematics; +using CultMath; using UnityEngine.Serialization; -using static Unity.Mathematics.math; -using int2 = Unity.Mathematics.int2; +using static CultMath.math; +using int2 = CultMath.int2; public class InventoryPanel : MonoBehaviour, IPointerClickHandler { diff --git a/Assets/Scripts/UI/Menu/MapMenuInput.cs b/Assets/Scripts/UI/Menu/MapMenuInput.cs index a59c2fbca..87dad2051 100644 --- a/Assets/Scripts/UI/Menu/MapMenuInput.cs +++ b/Assets/Scripts/UI/Menu/MapMenuInput.cs @@ -4,7 +4,7 @@ using System.Collections; using System.Collections.Generic; -using Unity.Mathematics; +using CultMath; using UnityEngine; using UnityEngine.EventSystems; diff --git a/Assets/Scripts/UI/Menu/MapRenderer.cs b/Assets/Scripts/UI/Menu/MapRenderer.cs index 298140899..5086794f6 100644 --- a/Assets/Scripts/UI/Menu/MapRenderer.cs +++ b/Assets/Scripts/UI/Menu/MapRenderer.cs @@ -7,10 +7,10 @@ using System.Collections; using System.Collections.Generic; using TMPro; using UnityEngine; -using Unity.Mathematics; +using CultMath; using UnityEngine.UI; -using static Unity.Mathematics.math; -using int2 = Unity.Mathematics.int2; +using static CultMath.math; +using int2 = CultMath.int2; public class MapRenderer : MonoBehaviour { diff --git a/Assets/Scripts/UI/Menu/SectorMap.cs b/Assets/Scripts/UI/Menu/SectorMap.cs index fa4d220d0..e48136437 100644 --- a/Assets/Scripts/UI/Menu/SectorMap.cs +++ b/Assets/Scripts/UI/Menu/SectorMap.cs @@ -7,11 +7,10 @@ using MessagePack; using TMPro; using UniRx; using UnityEngine; -using Unity.Mathematics; -using static Unity.Mathematics.math; -using static Unity.Mathematics.noise; +using CultMath; +using static CultMath.math; using Random = UnityEngine.Random; -using float2 = Unity.Mathematics.float2; +using float2 = CultMath.float2; public class SectorMap : MonoBehaviour { diff --git a/Assets/Scripts/UI/Menu/SectorRenderer.cs b/Assets/Scripts/UI/Menu/SectorRenderer.cs index a5d61461c..de8a3e87b 100644 --- a/Assets/Scripts/UI/Menu/SectorRenderer.cs +++ b/Assets/Scripts/UI/Menu/SectorRenderer.cs @@ -5,9 +5,9 @@ using UniRx; using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.UI; -using Unity.Mathematics; -using static Unity.Mathematics.math; -using float2 = Unity.Mathematics.float2; +using CultMath; +using static CultMath.math; +using float2 = CultMath.float2; public class SectorRenderer : MonoBehaviour, IBeginDragHandler, IDragHandler, IScrollHandler { diff --git a/Assets/Scripts/UI/Menu/TradeMenu.cs b/Assets/Scripts/UI/Menu/TradeMenu.cs index e9b0e403e..1a0e8a571 100644 --- a/Assets/Scripts/UI/Menu/TradeMenu.cs +++ b/Assets/Scripts/UI/Menu/TradeMenu.cs @@ -7,8 +7,8 @@ using System.Runtime.Remoting.Contexts; using TMPro; using UnityEngine; using UnityEngine.UI; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; public class TradeMenu : MonoBehaviour { diff --git a/Assets/Scripts/UI/Menu/TradeMenuDebug.cs b/Assets/Scripts/UI/Menu/TradeMenuDebug.cs index f6d60355d..ddfe967f3 100644 --- a/Assets/Scripts/UI/Menu/TradeMenuDebug.cs +++ b/Assets/Scripts/UI/Menu/TradeMenuDebug.cs @@ -7,8 +7,8 @@ using System.Runtime.Remoting.Contexts; using TMPro; using UnityEngine; using UnityEngine.UI; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; public class TradeMenuDebug : MonoBehaviour { diff --git a/Assets/Scripts/UI/Properties Panel/CurveField.cs b/Assets/Scripts/UI/Properties Panel/CurveField.cs index 6327c0778..48c992890 100644 --- a/Assets/Scripts/UI/Properties Panel/CurveField.cs +++ b/Assets/Scripts/UI/Properties Panel/CurveField.cs @@ -6,7 +6,7 @@ using TMPro; using UnityEngine; using UnityEngine.UI; using UnityEngine.UI.Extensions; -using static Unity.Mathematics.math; +using static CultMath.math; public class CurveField : MonoBehaviour { diff --git a/Assets/Scripts/UI/Properties Panel/PropertiesPanel.cs b/Assets/Scripts/UI/Properties Panel/PropertiesPanel.cs index 75e37f58a..968d17d49 100644 --- a/Assets/Scripts/UI/Properties Panel/PropertiesPanel.cs +++ b/Assets/Scripts/UI/Properties Panel/PropertiesPanel.cs @@ -13,8 +13,8 @@ using UniRx; using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.UI; -using Unity.Mathematics; -using static Unity.Mathematics.math; +using CultMath; +using static CultMath.math; public class PropertiesPanel : MonoBehaviour { diff --git a/Assets/Scripts/UI/TextButton.cs b/Assets/Scripts/UI/TextButton.cs index 3c5b38554..8138cf50e 100644 --- a/Assets/Scripts/UI/TextButton.cs +++ b/Assets/Scripts/UI/TextButton.cs @@ -4,7 +4,7 @@ using TMPro; using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.UI; -using static Unity.Mathematics.math; +using static CultMath.math; public class TextButton : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler { diff --git a/Assets/Scripts/UnityExtensions.cs b/Assets/Scripts/UnityExtensions.cs index febd4bf96..e10edaea5 100644 --- a/Assets/Scripts/UnityExtensions.cs +++ b/Assets/Scripts/UnityExtensions.cs @@ -5,11 +5,11 @@ using System.Linq; using System.Reflection; using System.Text.RegularExpressions; using MessagePack; -using Unity.Mathematics; +using CultMath; using UnityEngine; using Random = UnityEngine.Random; -using static Unity.Mathematics.math; +using static CultMath.math; public static class UnitySceneExtensions { diff --git a/Assets/Scripts/Zone Display/GradientMapper.cs b/Assets/Scripts/Zone Display/GradientMapper.cs index e10920f2b..ab07b8471 100644 --- a/Assets/Scripts/Zone Display/GradientMapper.cs +++ b/Assets/Scripts/Zone Display/GradientMapper.cs @@ -7,7 +7,7 @@ using System.Collections.Generic; using UnityEngine; using System.IO; using System.Linq; -using static Unity.Mathematics.math; +using static CultMath.math; #if UNITY_EDITOR using UnityEditor; diff --git a/Assets/Scripts/Zone Display/SunMaterial.cs b/Assets/Scripts/Zone Display/SunMaterial.cs index 822d1ae44..80fd7df86 100644 --- a/Assets/Scripts/Zone Display/SunMaterial.cs +++ b/Assets/Scripts/Zone Display/SunMaterial.cs @@ -5,7 +5,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -using static Unity.Mathematics.math; +using static CultMath.math; //[ExecuteInEditMode] public class SunMaterial : MonoBehaviour diff --git a/Assets/Scripts/Zone Display/VolumeSampling.cs b/Assets/Scripts/Zone Display/VolumeSampling.cs index 0621970c7..fd9d9f1e9 100644 --- a/Assets/Scripts/Zone Display/VolumeSampling.cs +++ b/Assets/Scripts/Zone Display/VolumeSampling.cs @@ -4,12 +4,11 @@ using System; using UnityEngine; -using Unity.Mathematics; +using CultMath; using UnityEngine.Experimental.Rendering; using UnityEngine.Rendering; using UnityEngine.Serialization; -using static Unity.Mathematics.math; -using static Unity.Mathematics.noise; +using static CultMath.math; /// /// Drives the volume render. diff --git a/Assets/Scripts/Zone Display/ZoneRenderer.cs b/Assets/Scripts/Zone Display/ZoneRenderer.cs index 781d669be..098e1f2b0 100644 --- a/Assets/Scripts/Zone Display/ZoneRenderer.cs +++ b/Assets/Scripts/Zone Display/ZoneRenderer.cs @@ -12,9 +12,9 @@ using UnityEngine; using UnityEngine.Serialization; using Object = UnityEngine.Object; using Random = UnityEngine.Random; -using Unity.Mathematics; -using static Unity.Mathematics.math; -using float2 = Unity.Mathematics.float2; +using CultMath; +using static CultMath.math; +using float2 = CultMath.float2; public class ZoneRenderer : MonoBehaviour { diff --git a/tools/AetherDb/AuthoredSettings.cs b/tools/AetherDb/AuthoredSettings.cs index d5b73c37c..85d3b461e 100644 --- a/tools/AetherDb/AuthoredSettings.cs +++ b/tools/AetherDb/AuthoredSettings.cs @@ -7,7 +7,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Reflection; -using Unity.Mathematics; +using CultMath; using YamlDotNet.RepresentationModel; // Reads the authored gameplay and generation settings out of Assets/Resources/Settings.asset, the Unity asset whose diff --git a/tools/AetherDb/Program.cs b/tools/AetherDb/Program.cs index 242b8481d..2e9ba6a93 100644 --- a/tools/AetherDb/Program.cs +++ b/tools/AetherDb/Program.cs @@ -7,8 +7,8 @@ using System.Collections.Generic; using System.IO; using System.Linq; using MessagePack; -using Unity.Mathematics; -using Random = Unity.Mathematics.Random; +using CultMath; +using Random = CultMath.Random; // Commands over the game database, run with: dotnet run --project tools/AetherDb -- public static class Program