Reduced nausea
This commit is contained in:
@@ -1,17 +1,17 @@
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
public class OrbitalPosition
|
||||
[System.Serializable] public class OrbitalPosition
|
||||
{
|
||||
public int m_AttachedRing;
|
||||
public float m_DistanceFromCentre;
|
||||
public float m_RadiusDistance;
|
||||
public float m_DistanceAlongRadius;
|
||||
public float m_ObjectRadius = 0.1f;
|
||||
|
||||
public OrbitalPositionBehaviour m_Behaviour;
|
||||
public readonly Transform m_Owner;
|
||||
|
||||
public int m_SpinSpeed = 1;
|
||||
public float m_SpinSpeed = 1f;
|
||||
|
||||
public OrbitalPosition(GameObject owner)
|
||||
{
|
||||
@@ -21,8 +21,8 @@ public class OrbitalPosition
|
||||
|
||||
public Vector3 TranslateToVec3() => new
|
||||
(
|
||||
x: m_DistanceFromCentre * Mathf.Cos(m_RadiusDistance),
|
||||
y: m_DistanceFromCentre * Mathf.Sin(m_RadiusDistance)
|
||||
x: m_DistanceFromCentre * Mathf.Cos(m_DistanceAlongRadius),
|
||||
y: m_DistanceFromCentre * Mathf.Sin(m_DistanceAlongRadius)
|
||||
);
|
||||
}
|
||||
|
||||
@@ -132,7 +132,7 @@ public class GlobalOrbitalPositionManager : MonoBehaviour
|
||||
|
||||
float distance = m_Distances[orbitalPosition.m_AttachedRing];
|
||||
orbitalPosition.m_DistanceFromCentre = distance;
|
||||
orbitalPosition.m_RadiusDistance = (orbitalPosition.m_RadiusDistance + Time.deltaTime * GlobalOrbitalSettings.RadiusSpeed) % (Mathf.PI * 2);
|
||||
orbitalPosition.m_DistanceAlongRadius = (orbitalPosition.m_DistanceAlongRadius + Time.deltaTime * GlobalOrbitalSettings.RadiusSpeed * orbitalPosition.m_SpinSpeed) % (Mathf.PI * 2);
|
||||
|
||||
orbitalPosition.m_Owner.position = orbitalPosition.TranslateToVec3();
|
||||
}
|
||||
@@ -155,6 +155,9 @@ public class GlobalOrbitalPositionManager : MonoBehaviour
|
||||
m_PlayerOrbitalPosition.m_Behaviour.OnCollision(orbital.m_Behaviour);
|
||||
}
|
||||
}
|
||||
|
||||
if (Random.Range(0, 20) == 0)
|
||||
Instantiate(GlobalOrbitalSettings.EnemyPrefab);
|
||||
}
|
||||
|
||||
public static void RegisterOrbitalPositionInstance(OrbitalPosition newInstance) =>
|
||||
@@ -166,7 +169,7 @@ public class GlobalOrbitalPositionManager : MonoBehaviour
|
||||
|
||||
public abstract class OrbitalPositionBehaviour : MonoBehaviour
|
||||
{
|
||||
protected OrbitalPosition m_OrbitalPosition;
|
||||
[SerializeField] protected OrbitalPosition m_OrbitalPosition;
|
||||
|
||||
private void Start()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user