Please review any and all PUBLIC repositories, groups, and associated files. These allow anyone on the Internet to access without authentication. Repository and group owners are responsible for their content and permission settings. Go to your project(s), click on Settings > General and expand the "Visibility, project features, permissions" to change this setting.

Commit de3f3328 authored by Norbraten, Terry's avatar Norbraten, Terry
Browse files

[Terry N.] DisTime already returns an int

parent 4c895fb9
...@@ -424,7 +424,7 @@ public class DISProtocolHandler ...@@ -424,7 +424,7 @@ public class DISProtocolHandler
disId.setValue(di.getSiteID(), di.getAppID(), di.getEntityID()); disId.setValue(di.getSiteID(), di.getAppID(), di.getEntityID());
WriterMapEntry entry = writerMap.get(disId); WriterMapEntry entry = writerMap.get(disId);
pdu.setTimestamp((int) disTime.getNpsTimestamp()); pdu.setTimestamp(disTime.getNpsTimestamp());
entry.writer.send(pdu); entry.writer.send(pdu);
} else { } else {
...@@ -437,7 +437,7 @@ public class DISProtocolHandler ...@@ -437,7 +437,7 @@ public class DISProtocolHandler
disId.setValue(di.getSiteID(), di.getAppID(), di.getEntityID()); disId.setValue(di.getSiteID(), di.getAppID(), di.getEntityID());
WriterMapEntry entry = writerMap.get(disId); WriterMapEntry entry = writerMap.get(disId);
pdu.setTimestamp((int) disTime.getNpsTimestamp()); pdu.setTimestamp(disTime.getNpsTimestamp());
entry.writer.send(pdu); entry.writer.send(pdu);
} else { } else {
// TODO: Check Dead Reckon error // TODO: Check Dead Reckon error
......
...@@ -442,7 +442,7 @@ public class DISXMLProtocolHandler ...@@ -442,7 +442,7 @@ public class DISXMLProtocolHandler
disId.setValue(di.getSiteID(), di.getAppID(), di.getEntityID()); disId.setValue(di.getSiteID(), di.getAppID(), di.getEntityID());
WriterMapEntryDX entry = writerMap.get(disId); WriterMapEntryDX entry = writerMap.get(disId);
pdu.setTimestamp((int) disTime.getNpsTimestamp()); pdu.setTimestamp(disTime.getNpsTimestamp());
try { try {
entry.writer.write(ByteBuffer.wrap(pdu.marshal())); entry.writer.write(ByteBuffer.wrap(pdu.marshal()));
} catch (Exception ex) { } catch (Exception ex) {
...@@ -458,7 +458,7 @@ public class DISXMLProtocolHandler ...@@ -458,7 +458,7 @@ public class DISXMLProtocolHandler
disId.setValue(di.getSiteID(), di.getAppID(), di.getEntityID()); disId.setValue(di.getSiteID(), di.getAppID(), di.getEntityID());
WriterMapEntryDX entry = writerMap.get(disId); WriterMapEntryDX entry = writerMap.get(disId);
pdu.setTimestamp((int) disTime.getNpsTimestamp()); pdu.setTimestamp(disTime.getNpsTimestamp());
try { try {
entry.writer.write(ByteBuffer.wrap(pdu.marshal())); entry.writer.write(ByteBuffer.wrap(pdu.marshal()));
} catch (Exception ex) { } catch (Exception ex) {
......
...@@ -1712,8 +1712,7 @@ public class BaseEspduTransform extends BaseGroupingNode ...@@ -1712,8 +1712,7 @@ public class BaseEspduTransform extends BaseGroupingNode
* @param scale The new scale component * @param scale The new scale component
* @throws InvalidFieldValueException The scale was null * @throws InvalidFieldValueException The scale was null
*/ */
public void setScale(float[] scale) public void setScale(float[] scale) throws InvalidFieldValueException {
throws InvalidFieldValueException {
if (scale == null) { if (scale == null) {
throw new InvalidFieldValueException("Scale value null"); throw new InvalidFieldValueException("Scale value null");
...@@ -1747,8 +1746,7 @@ public class BaseEspduTransform extends BaseGroupingNode ...@@ -1747,8 +1746,7 @@ public class BaseEspduTransform extends BaseGroupingNode
* @param so The new scale orientation component * @param so The new scale orientation component
* @throws InvalidFieldValueException The scale orientation was null * @throws InvalidFieldValueException The scale orientation was null
*/ */
public void setScaleOrientation(float[] so) public void setScaleOrientation(float[] so) throws InvalidFieldValueException {
throws InvalidFieldValueException {
if (so == null) { if (so == null) {
throw new InvalidFieldValueException("Scale Orientation value null"); throw new InvalidFieldValueException("Scale Orientation value null");
} }
...@@ -1782,8 +1780,7 @@ public class BaseEspduTransform extends BaseGroupingNode ...@@ -1782,8 +1780,7 @@ public class BaseEspduTransform extends BaseGroupingNode
* @param center The new center component * @param center The new center component
* @throws InvalidFieldValueException The center was null * @throws InvalidFieldValueException The center was null
*/ */
public void setCenter(float[] center) public void setCenter(float[] center) throws InvalidFieldValueException {
throws InvalidFieldValueException {
if (center == null) { if (center == null) {
throw new InvalidFieldValueException("Center value null"); throw new InvalidFieldValueException("Center value null");
...@@ -3284,7 +3281,7 @@ public class BaseEspduTransform extends BaseGroupingNode ...@@ -3284,7 +3281,7 @@ public class BaseEspduTransform extends BaseGroupingNode
v3f.setX(-vfLinearAcceleration[1]); v3f.setX(-vfLinearAcceleration[1]);
espdu.getDeadReckoningParameters().setEntityLinearAcceleration(v3f); espdu.getDeadReckoningParameters().setEntityLinearAcceleration(v3f);
espdu.setTimestamp((int) new DisTime().getNpsTimestamp()); espdu.setTimestamp(new DisTime().getNpsTimestamp());
lastWrite = vrmlClock.getTime(); lastWrite = vrmlClock.getTime();
needToWrite = false; needToWrite = false;
...@@ -3534,6 +3531,9 @@ public class BaseEspduTransform extends BaseGroupingNode ...@@ -3534,6 +3531,9 @@ public class BaseEspduTransform extends BaseGroupingNode
vfArticulationParameterArray[i]; vfArticulationParameterArray[i];
hasChanged[FIELD_ARTICULATION_PARAMETER_VALUE7_CHANGED] = true; hasChanged[FIELD_ARTICULATION_PARAMETER_VALUE7_CHANGED] = true;
break; break;
default:
break;
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment