From de3f3328a0e8306d6372f2c57039dd24d96299d2 Mon Sep 17 00:00:00 2001
From: "Norbraten, Terry" <tdnorbra@nps.edu>
Date: Mon, 19 Jul 2021 21:38:07 -0700
Subject: [PATCH] [Terry N.] DisTime already returns an int
---
.../common/input/dis/DISProtocolHandler.java | 4 ++--
.../common/input/dis/DISXMLProtocolHandler.java | 4 ++--
.../common/nodes/dis/BaseEspduTransform.java | 14 +++++++-------
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/java/org/web3d/vrml/renderer/common/input/dis/DISProtocolHandler.java b/src/java/org/web3d/vrml/renderer/common/input/dis/DISProtocolHandler.java
index 2ac5552f..e3e32d1e 100644
--- a/src/java/org/web3d/vrml/renderer/common/input/dis/DISProtocolHandler.java
+++ b/src/java/org/web3d/vrml/renderer/common/input/dis/DISProtocolHandler.java
@@ -424,7 +424,7 @@ public class DISProtocolHandler
disId.setValue(di.getSiteID(), di.getAppID(), di.getEntityID());
WriterMapEntry entry = writerMap.get(disId);
- pdu.setTimestamp((int) disTime.getNpsTimestamp());
+ pdu.setTimestamp(disTime.getNpsTimestamp());
entry.writer.send(pdu);
} else {
@@ -437,7 +437,7 @@ public class DISProtocolHandler
disId.setValue(di.getSiteID(), di.getAppID(), di.getEntityID());
WriterMapEntry entry = writerMap.get(disId);
- pdu.setTimestamp((int) disTime.getNpsTimestamp());
+ pdu.setTimestamp(disTime.getNpsTimestamp());
entry.writer.send(pdu);
} else {
// TODO: Check Dead Reckon error
diff --git a/src/java/org/web3d/vrml/renderer/common/input/dis/DISXMLProtocolHandler.java b/src/java/org/web3d/vrml/renderer/common/input/dis/DISXMLProtocolHandler.java
index 3552dc3d..944866a2 100644
--- a/src/java/org/web3d/vrml/renderer/common/input/dis/DISXMLProtocolHandler.java
+++ b/src/java/org/web3d/vrml/renderer/common/input/dis/DISXMLProtocolHandler.java
@@ -442,7 +442,7 @@ public class DISXMLProtocolHandler
disId.setValue(di.getSiteID(), di.getAppID(), di.getEntityID());
WriterMapEntryDX entry = writerMap.get(disId);
- pdu.setTimestamp((int) disTime.getNpsTimestamp());
+ pdu.setTimestamp(disTime.getNpsTimestamp());
try {
entry.writer.write(ByteBuffer.wrap(pdu.marshal()));
} catch (Exception ex) {
@@ -458,7 +458,7 @@ public class DISXMLProtocolHandler
disId.setValue(di.getSiteID(), di.getAppID(), di.getEntityID());
WriterMapEntryDX entry = writerMap.get(disId);
- pdu.setTimestamp((int) disTime.getNpsTimestamp());
+ pdu.setTimestamp(disTime.getNpsTimestamp());
try {
entry.writer.write(ByteBuffer.wrap(pdu.marshal()));
} catch (Exception ex) {
diff --git a/src/java/org/web3d/vrml/renderer/common/nodes/dis/BaseEspduTransform.java b/src/java/org/web3d/vrml/renderer/common/nodes/dis/BaseEspduTransform.java
index 1ba45dd4..544e94e9 100644
--- a/src/java/org/web3d/vrml/renderer/common/nodes/dis/BaseEspduTransform.java
+++ b/src/java/org/web3d/vrml/renderer/common/nodes/dis/BaseEspduTransform.java
@@ -1712,8 +1712,7 @@ public class BaseEspduTransform extends BaseGroupingNode
* @param scale The new scale component
* @throws InvalidFieldValueException The scale was null
*/
- public void setScale(float[] scale)
- throws InvalidFieldValueException {
+ public void setScale(float[] scale) throws InvalidFieldValueException {
if (scale == null) {
throw new InvalidFieldValueException("Scale value null");
@@ -1747,8 +1746,7 @@ public class BaseEspduTransform extends BaseGroupingNode
* @param so The new scale orientation component
* @throws InvalidFieldValueException The scale orientation was null
*/
- public void setScaleOrientation(float[] so)
- throws InvalidFieldValueException {
+ public void setScaleOrientation(float[] so) throws InvalidFieldValueException {
if (so == null) {
throw new InvalidFieldValueException("Scale Orientation value null");
}
@@ -1782,8 +1780,7 @@ public class BaseEspduTransform extends BaseGroupingNode
* @param center The new center component
* @throws InvalidFieldValueException The center was null
*/
- public void setCenter(float[] center)
- throws InvalidFieldValueException {
+ public void setCenter(float[] center) throws InvalidFieldValueException {
if (center == null) {
throw new InvalidFieldValueException("Center value null");
@@ -3284,7 +3281,7 @@ public class BaseEspduTransform extends BaseGroupingNode
v3f.setX(-vfLinearAcceleration[1]);
espdu.getDeadReckoningParameters().setEntityLinearAcceleration(v3f);
- espdu.setTimestamp((int) new DisTime().getNpsTimestamp());
+ espdu.setTimestamp(new DisTime().getNpsTimestamp());
lastWrite = vrmlClock.getTime();
needToWrite = false;
@@ -3534,6 +3531,9 @@ public class BaseEspduTransform extends BaseGroupingNode
vfArticulationParameterArray[i];
hasChanged[FIELD_ARTICULATION_PARAMETER_VALUE7_CHANGED] = true;
break;
+
+ default:
+ break;
}
}
--
GitLab