From cbe4001d25ec22ba02203b5ad6217ac4380c9db2 Mon Sep 17 00:00:00 2001
From: Sean Islas <seanislas@whiteoakfarmandranch.com>
Date: Wed, 17 May 2023 10:25:51 -0700
Subject: [PATCH] Update to Assignment 3 - Islas
---
.../homework3/Islas/ExampleSimulationProgram.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/assignments/src/MV3500Cohort2023MarchJune/homework3/Islas/ExampleSimulationProgram.java b/assignments/src/MV3500Cohort2023MarchJune/homework3/Islas/ExampleSimulationProgram.java
index 969c44d902..f21d15eae2 100644
--- a/assignments/src/MV3500Cohort2023MarchJune/homework3/Islas/ExampleSimulationProgram.java
+++ b/assignments/src/MV3500Cohort2023MarchJune/homework3/Islas/ExampleSimulationProgram.java
@@ -236,20 +236,23 @@ public class ExampleSimulationProgram
Double dMinusP_X = entityStatePdu_2.getEntityLocation().getX() - entityStatePdu_1.getEntityLocation().getX();
Double dMinusP_Z = entityStatePdu_2.getEntityLocation().getZ() - entityStatePdu_1.getEntityLocation().getZ();
Double magnitudeDMinusP = Math.sqrt(dMinusP_X * dMinusP_X + dMinusP_Z * dMinusP_Z);
-
Double speed = 77.2; // Average speed of CH53 - meters per second
+ // Final velocity values
Double velocityX = dMinusP_X * speed / magnitudeDMinusP;
Double velocityZ = dMinusP_Z * speed / magnitudeDMinusP;
+ // Moves Entity 1 towards Entity 2
entityStatePdu_1.getEntityLocation().setX(entityStatePdu_1.getEntityLocation().getX() + velocityX);
entityStatePdu_1.getEntityLocation().setZ(entityStatePdu_1.getEntityLocation().getZ() + velocityZ);
- // decide whether to fire, and then update the firePdu. Hmmm, you might want a target to shoot at!
+
+ // Calculates the total distance between the two Entities
double magnitudeX = entityStatePdu_2.getEntityLocation().getX() - entityStatePdu_1.getEntityLocation().getX();
double magnitudeY = entityStatePdu_2.getEntityLocation().getY() - entityStatePdu_1.getEntityLocation().getY();
double magnitudeZ = entityStatePdu_2.getEntityLocation().getZ() - entityStatePdu_1.getEntityLocation().getZ();
double magnitude = Math.sqrt(magnitudeX * magnitudeX + magnitudeY * magnitudeY + magnitudeZ * magnitudeZ);
+ // Shows an easy to identify log of Entity movement and a firing action
System.out.println("");
System.out.println(entityStatePdu_1.getEntityLocation());
if (magnitude < firePdu_1a.getRange()) {
@@ -259,6 +262,7 @@ public class ExampleSimulationProgram
System.out.println("Fire at target");
}
System.out.println("");
+
// etc. etc. your code goes here for your simulation of interest
// something happens between my simulation entities, la de da de da...
--
GitLab