From ca9f2b0ce2e23289df9e9132f0e763660d175f19 Mon Sep 17 00:00:00 2001
From: brutzman <brutzman@nps.edu>
Date: Thu, 21 Dec 2023 20:34:36 -0800
Subject: [PATCH] updated build, multiple improvements
---
.../src/OpenDis7Examples/AllPduSenderLog.txt | 4 ++--
.../src/OpenDis7Examples/EspduSenderLog.txt | 20 +++++++++----------
.../ExampleSimulationProgramLog.txt | 2 +-
.../ExampleTrackInterpolationLog.txt | 19 ++++++------------
4 files changed, 19 insertions(+), 26 deletions(-)
diff --git a/examples/src/OpenDis7Examples/AllPduSenderLog.txt b/examples/src/OpenDis7Examples/AllPduSenderLog.txt
index 2d064757fa..d4859b8653 100644
--- a/examples/src/OpenDis7Examples/AllPduSenderLog.txt
+++ b/examples/src/OpenDis7Examples/AllPduSenderLog.txt
@@ -41,7 +41,7 @@ Sent packet #21, DisPduType 21 EVENT_REPORT (packet.getLen
Sent packet #22, DisPduType 22 COMMENT (packet.getLength()=112) of type CommentPdu
Sent packet #23, DisPduType 23 ELECTROMAGNETIC_EMISSION (packet.getLength()= 28) of type ElectromagneticEmissionPdu
Sent packet #24, DisPduType 24 DESIGNATOR (packet.getLength()= 88) of type DesignatorPdu
-Sent packet #25, DisPduType 25 TRANSMITTER (packet.getLength()=106) of type TransmitterPdu
+Sent packet #25, DisPduType 25 TRANSMITTER (packet.getLength()=104) of type TransmitterPdu
Sent packet #26, DisPduType 26 SIGNAL (packet.getLength()= 36) of type SignalPdu
Sent packet #27, DisPduType 27 RECEIVER (packet.getLength()= 36) of type ReceiverPdu
Sent packet #28, DisPduType 28 IDENTIFICATION_FRIEND_OR_FOE (packet.getLength()= 60) of type IdentificationFriendOrFoePdu
@@ -90,4 +90,4 @@ Sent packet #70, DisPduType 70 INFORMATION_OPERATIONS_ACTION (packet.getLen
Sent packet #71, DisPduType 71 INFORMATION_OPERATIONS_REPORT (packet.getLength()= 40) of type InformationOperationsReportPdu
Sent packet #72, DisPduType 72 ATTRIBUTE (packet.getLength()= 32) of type AttributePdu
OpenDis7Examples.AllPduSender complete, sent 72 PDUs total.
-BUILD SUCCESSFUL (total time: 2 seconds)
+BUILD SUCCESSFUL (total time: 3 seconds)
diff --git a/examples/src/OpenDis7Examples/EspduSenderLog.txt b/examples/src/OpenDis7Examples/EspduSenderLog.txt
index 147bd57a2f..5e5a864097 100644
--- a/examples/src/OpenDis7Examples/EspduSenderLog.txt
+++ b/examples/src/OpenDis7Examples/EspduSenderLog.txt
@@ -27,10 +27,10 @@ Espdu #1 entityID=[1,2,3]
FirePdu #1 firePdu=[FireMissionIndex=0, descriptor=MunitionDescriptor munitionType:EntityType entityKind:EntityKind 0 OTHER domain:Other country:Country 0 OTHER category:0 subCategory:0 specific:0 extra:0 warhead:MunitionDescriptorWarhead 0 OTHER fuse:MunitionDescriptorFuse 0 OTHER quantity:0 rate:0]
[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 127.255.255.255 port 3000
[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 02 FIRE ] packet.getLength()= 1500, to 127.255.255.255 port 3000
+[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 192.168.1.255 port 3000
+[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 02 FIRE ] packet.getLength()= 1500, to 192.168.1.255 port 3000
[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 172.20.209.15 port 3000
[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 02 FIRE ] packet.getLength()= 1500, to 172.20.209.15 port 3000
-[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 10.0.0.255 port 3000
-[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 02 FIRE ] packet.getLength()= 1500, to 10.0.0.255 port 3000
===============
Create new PDUs
latitude, longitude: [36.595517, -121.877]
@@ -39,10 +39,10 @@ Espdu #2 entityID=[1,2,3]
FirePdu #2 firePdu=[FireMissionIndex=0, descriptor=MunitionDescriptor munitionType:EntityType entityKind:EntityKind 0 OTHER domain:Other country:Country 0 OTHER category:0 subCategory:0 specific:0 extra:0 warhead:MunitionDescriptorWarhead 0 OTHER fuse:MunitionDescriptorFuse 0 OTHER quantity:0 rate:0]
[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 127.255.255.255 port 3000
[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 02 FIRE ] packet.getLength()= 1500, to 127.255.255.255 port 3000
+[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 192.168.1.255 port 3000
+[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 02 FIRE ] packet.getLength()= 1500, to 192.168.1.255 port 3000
[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 172.20.209.15 port 3000
[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 02 FIRE ] packet.getLength()= 1500, to 172.20.209.15 port 3000
-[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 10.0.0.255 port 3000
-[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 02 FIRE ] packet.getLength()= 1500, to 10.0.0.255 port 3000
===============
Create new PDUs
latitude, longitude: [36.595517, -121.87706]
@@ -51,10 +51,10 @@ Espdu #3 entityID=[1,2,3]
FirePdu #3 firePdu=[FireMissionIndex=0, descriptor=MunitionDescriptor munitionType:EntityType entityKind:EntityKind 0 OTHER domain:Other country:Country 0 OTHER category:0 subCategory:0 specific:0 extra:0 warhead:MunitionDescriptorWarhead 0 OTHER fuse:MunitionDescriptorFuse 0 OTHER quantity:0 rate:0]
[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 127.255.255.255 port 3000
[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 02 FIRE ] packet.getLength()= 1500, to 127.255.255.255 port 3000
+[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 192.168.1.255 port 3000
+[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 02 FIRE ] packet.getLength()= 1500, to 192.168.1.255 port 3000
[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 172.20.209.15 port 3000
[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 02 FIRE ] packet.getLength()= 1500, to 172.20.209.15 port 3000
-[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 10.0.0.255 port 3000
-[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 02 FIRE ] packet.getLength()= 1500, to 10.0.0.255 port 3000
===============
Create new PDUs
latitude, longitude: [36.595517, -121.877]
@@ -63,10 +63,10 @@ Espdu #4 entityID=[1,2,3]
FirePdu #4 firePdu=[FireMissionIndex=0, descriptor=MunitionDescriptor munitionType:EntityType entityKind:EntityKind 0 OTHER domain:Other country:Country 0 OTHER category:0 subCategory:0 specific:0 extra:0 warhead:MunitionDescriptorWarhead 0 OTHER fuse:MunitionDescriptorFuse 0 OTHER quantity:0 rate:0]
[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 127.255.255.255 port 3000
[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 02 FIRE ] packet.getLength()= 1500, to 127.255.255.255 port 3000
+[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 192.168.1.255 port 3000
+[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 02 FIRE ] packet.getLength()= 1500, to 192.168.1.255 port 3000
[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 172.20.209.15 port 3000
[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 02 FIRE ] packet.getLength()= 1500, to 172.20.209.15 port 3000
-[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 10.0.0.255 port 3000
-[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 02 FIRE ] packet.getLength()= 1500, to 10.0.0.255 port 3000
===============
Create new PDUs
latitude, longitude: [36.595517, -121.87706]
@@ -75,10 +75,10 @@ Espdu #5 entityID=[1,2,3]
FirePdu #5 firePdu=[FireMissionIndex=0, descriptor=MunitionDescriptor munitionType:EntityType entityKind:EntityKind 0 OTHER domain:Other country:Country 0 OTHER category:0 subCategory:0 specific:0 extra:0 warhead:MunitionDescriptorWarhead 0 OTHER fuse:MunitionDescriptorFuse 0 OTHER quantity:0 rate:0]
[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 127.255.255.255 port 3000
[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 02 FIRE ] packet.getLength()= 1500, to 127.255.255.255 port 3000
+[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 192.168.1.255 port 3000
+[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 02 FIRE ] packet.getLength()= 1500, to 192.168.1.255 port 3000
[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 172.20.209.15 port 3000
[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 02 FIRE ] packet.getLength()= 1500, to 172.20.209.15 port 3000
-[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 10.0.0.255 port 3000
-[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 02 FIRE ] packet.getLength()= 1500, to 10.0.0.255 port 3000
===============
[OpenDis7Examples.EspduSender] complete.
BUILD SUCCESSFUL (total time: 8 seconds)
diff --git a/examples/src/OpenDis7Examples/ExampleSimulationProgramLog.txt b/examples/src/OpenDis7Examples/ExampleSimulationProgramLog.txt
index efe9354aad..d67be5ac8c 100644
--- a/examples/src/OpenDis7Examples/ExampleSimulationProgramLog.txt
+++ b/examples/src/OpenDis7Examples/ExampleSimulationProgramLog.txt
@@ -29,7 +29,7 @@ run-single:
[DisChannel ExampleSimulationProgram] main() started...
[DisThreadedNetworkInterface ExampleSimulationProgram] [sending 4] DisPduType 22 COMMENT, size 104 bytes)
[DisThreadedNetworkInterface ExampleSimulationProgram] [receipt 4] DisPduType 22 COMMENT, size 104 bytes)
-[DisChannel ExampleSimulationProgram] *** [CommentPdu TIME] [Simulation time 0.0 at LocalDateTime 2023-12-20T15:03:56.380266]
+[DisChannel ExampleSimulationProgram] *** [CommentPdu TIME] [Simulation time 0.0 at LocalDateTime 2023-12-21T20:21:18.287147]
... My simulation just did something, no really...
... [Pausing for 1.0 seconds]
... sending PDUs of interest for simulation step 1, monitor loopback to confirm sent
diff --git a/examples/src/OpenDis7Examples/ExampleTrackInterpolationLog.txt b/examples/src/OpenDis7Examples/ExampleTrackInterpolationLog.txt
index ebb2d4ed33..eb51d89da8 100644
--- a/examples/src/OpenDis7Examples/ExampleTrackInterpolationLog.txt
+++ b/examples/src/OpenDis7Examples/ExampleTrackInterpolationLog.txt
@@ -9,29 +9,22 @@ warning: [options] system modules path not set in conjunction with -source 17
compile-single:
run-single:
[DisChannel] thisHostName=IT160907-INFLPP
-[DisThreadedNetworkInterface] using network interface PANGP Virtual Ethernet Adapter Secure
-[DisThreadedNetworkInterface] datagramSocket.joinGroup address=239.1.2.3 port=3000 isConnected()=false createDatagramSocket() complete.
-[DisThreadedNetworkInterface] createThreads() sendingThread.isAlive()=true
-[DisThreadedNetworkInterface] createThreads() receiveThread.isAlive()=true
-[DisChannel ExampleTrackInterpolation] Network confirmation: address=239.1.2.3 port=3000
[DisChannel ExampleTrackInterpolation] Beginning pdu save to directory ./pduLog
-[PduRecorder] Recorder log file open: C:\x3d-nps-gitlab\NetworkedGraphicsMV3500\examples\pduLog\PduCaptureLog.dislog
+[PduRecorder ExampleTrackInterpolation] Recorder log file open: C:\x3d-nps-gitlab\NetworkedGraphicsMV3500\examples\pduLog\PduCaptureLog.dislog
[DisThreadedNetworkInterface] using network interface PANGP Virtual Ethernet Adapter Secure
[DisThreadedNetworkInterface] datagramSocket.joinGroup address=239.1.2.3 port=3000 isConnected()=false createDatagramSocket() complete.
[DisThreadedNetworkInterface] createThreads() sendingThread.isAlive()=true
[DisThreadedNetworkInterface] createThreads() receiveThread.isAlive()=true
-[PduRecorder PduRecorder] listening to IP address 239.1.2.3 on port 3000
+[PduRecorder ExampleTrackInterpolation] listening to IP address 239.1.2.3 on port 3000
+[DisChannel ExampleTrackInterpolation] Network confirmation: address=239.1.2.3 port=3000
[DisChannel ExampleTrackInterpolation] just checking: disChannel.getNetworkAddress()=239.1.2.3, getNetworkPort()=3000
[DisChannel ExampleTrackInterpolation] just checking: hasVerboseSending()=true, hasVerboseReceipt()=true
-[DisThreadedNetworkInterface ExampleTrackInterpolation] [receipt 1] DisPduType 11 CREATE_ENTITY, size 28 bytes)
[DisThreadedNetworkInterface ExampleTrackInterpolation] [sending 1] DisPduType 11 CREATE_ENTITY, size 28 bytes)
[DisThreadedNetworkInterface ExampleTrackInterpolation] [sending 2] DisPduType 11 CREATE_ENTITY, size 28 bytes)
+[DisThreadedNetworkInterface ExampleTrackInterpolation] [receipt 1] DisPduType 11 CREATE_ENTITY, size 28 bytes)
[DisThreadedNetworkInterface ExampleTrackInterpolation] [sending 3] DisPduType 22 COMMENT, size 80 bytes)
[DisThreadedNetworkInterface ExampleTrackInterpolation] [receipt 2] DisPduType 11 CREATE_ENTITY, size 28 bytes)
[DisThreadedNetworkInterface ExampleTrackInterpolation] [receipt 3] DisPduType 22 COMMENT, size 80 bytes)
-[DisThreadedNetworkInterface PduRecorder] [receipt 1] DisPduType 11 CREATE_ENTITY, size 28 bytes)
-[DisThreadedNetworkInterface PduRecorder] [receipt 2] DisPduType 11 CREATE_ENTITY, size 28 bytes)
-[DisThreadedNetworkInterface PduRecorder] [receipt 3] DisPduType 22 COMMENT, size 80 bytes)
[DisChannel ExampleTrackInterpolation] *** [CommentPdu APPLICATION_TIMESTEP] [Simulation timestep duration 1.0 seconds]
[DisChannel ExampleTrackInterpolation] main() started...
0 Entity location=( 0.0, 0.0, 0.0) NORTH
@@ -130,7 +123,7 @@ pduTrack_1 duration = 42.0 seconds = 0 ticks
<meta content='ExampleTrackInterpolation.x3d' name='title'/>
<meta content='Conversion of ESPDU track into X3D animation interpolators and LineSet.' name='description'/>
<meta content='1 January 2022' name='created'/>
- <meta content='19 December 2023' name='modified'/>
+ <meta content='21 December 2023' name='modified'/>
<meta content='Don Brutzman' name='creator'/>
<meta content='https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/examples/src/OpenDis7Examples/ExampleTrackInterpolation.x3d' name='identifier'/>
<meta content='PduTrack utility, opendis7-java Library https://github.com/open-dis/opendis7-java' name='generator'/>
@@ -301,4 +294,4 @@ pduTrack_1 duration = 42.0 seconds = 0 ticks
PduRecorder.stop() closing recorder log file:
C:\x3d-nps-gitlab\NetworkedGraphicsMV3500\examples\pduLog\PduCaptureLog.dislog
[DisChannel ExampleTrackInterpolation] complete.
-BUILD SUCCESSFUL (total time: 15 seconds)
+BUILD SUCCESSFUL (total time: 14 seconds)
--
GitLab