diff --git a/examples/DisDemo/build.run.log.txt b/examples/DisDemo/build.run.log.txt index 51bde247b8092ed10824131d468191d4de96528d..c135eaa76b72a80c6300ec715047b648b6f87d48 100644 --- a/examples/DisDemo/build.run.log.txt +++ b/examples/DisDemo/build.run.log.txt @@ -1,15 +1,12 @@ -ant -f C:\\x-nps-gitlab\\NetworkedGraphicsMV3500\\examples\\DisDemo -Dnb.internal.action.name=run.single -Djavac.includes=DisDemo/DisDemonstration.java -Drun.class=DisDemo.DisDemonstration run-single +ant -f C:\\x-nps-gitlab\\NetworkedGraphicsMV3500\\examples\\DisDemo -Dnb.internal.action.name=run run init: Deleting: C:\x-nps-gitlab\NetworkedGraphicsMV3500\examples\DisDemo\build\built-jar.properties deps-jar: Updating property file: C:\x-nps-gitlab\NetworkedGraphicsMV3500\examples\DisDemo\build\built-jar.properties -Compiling 1 source file to C:\x-nps-gitlab\NetworkedGraphicsMV3500\examples\DisDemo\build\classes -warning: [options] bootstrap class path not set in conjunction with -source 8 -1 warning -compile-single: -run-single: +compile: +run: DisDemo.DisDemonstration: sending 20 ESPDU packets at 1000 msec (1.0 second) intervals on - broadcast address=[/172.16.0.255] port 3000 + broadcast address=[/172.20.210.244, /172.16.0.255] port 3000 Current position: 0.0, 1.0, 0.0 ... sent DIS ESPDU 1 of 20 Current position: 0.0, 2.0, 0.0 @@ -50,4 +47,4 @@ Current position: 0.0, 19.0, 0.0 ... sent DIS ESPDU 19 of 20 Current position: 0.0, 20.0, 0.0 ... sent DIS ESPDU 20 of 20 -BUILD SUCCESSFUL (total time: 21 seconds) +BUILD SUCCESSFUL (total time: 20 seconds) diff --git a/examples/DisDemo/nbproject/project.properties b/examples/DisDemo/nbproject/project.properties index 9af5f15ba2340b16f3d39a85d0a71aefa23c7b06..fc4d35111e95d4fa1e2ad97d5b686bac1a67c83c 100644 --- a/examples/DisDemo/nbproject/project.properties +++ b/examples/DisDemo/nbproject/project.properties @@ -33,14 +33,12 @@ dist.jar=${dist.dir}/DisDemo.jar dist.javadoc.dir=${dist.dir}/javadoc endorsed.classpath= excludes= -file.reference.open-dis7-enumerations-classes.jar=lib/open-dis7-enumerations-classes.jar -file.reference.open-dis7-pdus-classes.jar=lib/open-dis7-pdus-classes.jar +file.reference.open-dis7-full.jar=../../lib/open-dis7-full.jar file.reference.srm-4.4.0.jar=lib/srm-4.4.0.jar includes=** jar.compress=false javac.classpath=\ - ${file.reference.open-dis7-enumerations-classes.jar}:\ - ${file.reference.open-dis7-pdus-classes.jar} + ${file.reference.open-dis7-full.jar} # Space-separated list of extra javac options javac.compilerargs=-Xlint:unchecked javac.deprecation=true diff --git a/examples/DisDemo/src/DisDemo/DisDemonstration.java b/examples/DisDemo/src/DisDemo/DisDemonstration.java index fc981b1c3af158c4700385a109dda1059131700f..a0855e8d876032a340cf2c4257a4ba7784e4aa02 100644 --- a/examples/DisDemo/src/DisDemo/DisDemonstration.java +++ b/examples/DisDemo/src/DisDemo/DisDemonstration.java @@ -4,7 +4,7 @@ import edu.nps.moves.dis7.enumerations.Country; import edu.nps.moves.dis7.enumerations.EntityKind; import edu.nps.moves.dis7.enumerations.ForceID; import edu.nps.moves.dis7.enumerations.PlatformDomain; -import edu.nps.moves.dis7.pdus.DisTime; +import edu.nps.moves.dis7.utilities.DisTime; import edu.nps.moves.dis7.pdus.Domain; import edu.nps.moves.dis7.pdus.EntityStatePdu; import edu.nps.moves.dis7.pdus.Vector3Double; @@ -98,7 +98,7 @@ public class DisDemonstration { espdu.setEntityLocation(currentPositionDisCoords); // Marshall it, send it - espdu.setTimestamp(new DisTime().getDisRelativeTimestamp()); + espdu.setTimestamp(DisTime.getCurrentDisRelativeTimestamp()); buffer = ByteBuffer.wrap(espdu.marshal()); for(InetAddress aBcast: allBcasts)