turtlebasket/micromissiles-unity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump to Unity 6000.0.20f1 (preview)

Browse Source
This commit is contained in:
Daniel Lovell
2024-09-25 17:51:44 -07:00
parent 55ece560a1
commit a829a05264
78 changed files with 49011 additions and 543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/Scripts/Agent.cs
View File

@@ -121,11 +121,11 @@ public abstract class Agent : MonoBehaviour {
}
public double GetSpeed() {
return GetComponent<Rigidbody>().velocity.magnitude;
return GetComponent<Rigidbody>().linearVelocity.magnitude;
}
public Vector3 GetVelocity() {
return GetComponent<Rigidbody>().velocity;
return GetComponent<Rigidbody>().linearVelocity;
}
public double GetDynamicPressure() {
@@ -185,7 +185,7 @@ public abstract class Agent : MonoBehaviour {
break;
}
_velocity = GetComponent<Rigidbody>().velocity;
_velocity = GetComponent<Rigidbody>().linearVelocity;
_acceleration =
GetComponent<Rigidbody>().GetAccumulatedForce() / GetComponent<Rigidbody>().mass;
}

2
Assets/Scripts/Interceptor.cs
View File

@@ -103,7 +103,7 @@ public class Interceptor : Agent {
float maxReferenceAcceleration =
(float)(_staticConfig.accelerationConfig.maxReferenceAcceleration * Constants.kGravity);
float referenceSpeed = _staticConfig.accelerationConfig.referenceSpeed;
return Mathf.Pow(GetComponent<Rigidbody>().velocity.magnitude / referenceSpeed, 2) *
return Mathf.Pow(GetComponent<Rigidbody>().linearVelocity.magnitude / referenceSpeed, 2) *
maxReferenceAcceleration;
}
protected Vector3 CalculateGravityProjectionOnPitchAndYaw() {

2
Assets/Scripts/Interceptors/Hydra70.cs
View File

@@ -42,7 +42,7 @@ public class Hydra70 : Interceptor {
AgentConfig.FromSubmunitionAgentConfig(_agentConfig.submunitions_config.agent_config);
convertedConfig.initial_state.position = transform.position;
convertedConfig.initial_state.velocity = GetComponent<Rigidbody>().velocity;
convertedConfig.initial_state.velocity = GetComponent<Rigidbody>().linearVelocity;
Interceptor submunition = SimManager.Instance.CreateInterceptor(convertedConfig);
submunitions.Add(submunition);
}

2
Assets/Scripts/Monitor.cs
View File

@@ -47,7 +47,7 @@ public class SimMonitor : MonoBehaviour
if(pos == Vector3.zero) {
continue;
}
Vector3 vel = agent.GetComponent<Rigidbody>().velocity;
Vector3 vel = agent.GetComponent<Rigidbody>().linearVelocity;
string type = agent is Threat ? "T" : "M";
writer.WriteLine($"{time:F2},{agent.name},{pos.x:F2},{pos.y:F2},{pos.z:F2},{vel.x:F2},{vel.y:F2},{vel.z:F2},{(int)agent.GetFlightPhase()},{type}");
}

2
Assets/Scripts/Sensors/IdealSensor.cs
View File

@@ -45,7 +45,7 @@ public class IdealSensor : Sensor {
// Calculate relative position and velocity
Vector3 relativePosition = target.transform.position - transform.position;
Vector3 relativeVelocity = target.GetVelocity() - GetComponent<Rigidbody>().velocity;
Vector3 relativeVelocity = target.GetVelocity() - GetComponent<Rigidbody>().linearVelocity;
// Calculate range rate (radial velocity)
velocitySensorOutput.range = Vector3.Dot(relativeVelocity, relativePosition.normalized);

2
Assets/Scripts/SimManager.cs
View File

@@ -265,7 +265,7 @@ public class SimManager : MonoBehaviour {
Rigidbody agentRigidbody = agentObject.GetComponent<Rigidbody>();
Vector3 velocityNoise = Utilities.GenerateRandomNoise(config.standard_deviation.velocity);
Vector3 noisyVelocity = config.initial_state.velocity + velocityNoise;
agentRigidbody.velocity = noisyVelocity;
agentRigidbody.linearVelocity = noisyVelocity;
agentObject.GetComponent<Agent>().SetAgentConfig(config);